[JENKINS-14240] Changlelog is missing user names

jenkinsci · Jun 28, 2012 · 685f3c3 · 685f3c3
1 parent 2fe5011
commit 685f3c3
Showing 1 changed file with 17 additions and 12 deletions.
diff --git a/src/main/java/net/praqma/hudson/Util.java b/src/main/java/net/praqma/hudson/Util.java
@@ -70,20 +70,25 @@ public static String createChangelog( List<Activity> changes, Baseline bl ) {
 		buffer.append( "<entry>" );
 		buffer.append( ( "<blName>" + bl.getShortname() + "</blName>" ) );
 		for( Activity act : changes ) {
-			buffer.append( "<activity>" );
-			buffer.append( ( "<actName>" + act.getShortname() + "</actName>" ) );
-			buffer.append( ( "<author>" + act.getUser() + "</author>" ) );
-			List<Version> versions = act.changeset.versions;
-			String temp = null;
-			for( Version v : versions ) {
-				try {
-					temp = "<file>" + v.getSFile() + " (" + v.getVersion() + ") user: " + v.blame() + "</file>";
-				} catch( ClearCaseException e ) {
-					logger.warning( "Could not generate log" );
+			try {
+				act.load();
+				buffer.append( "<activity>" );
+				buffer.append( ( "<actName>" + act.getShortname() + "</actName>" ) );
+				buffer.append( ( "<author>" + act.getUser() + "</author>" ) );
+				List<Version> versions = act.changeset.versions;
+				String temp = null;
+				for( Version v : versions ) {
+					try {
+						temp = "<file>" + v.getSFile() + " (" + v.getVersion() + ") user: " + v.blame() + "</file>";
+					} catch( ClearCaseException e ) {
+						logger.warning( "Could not generate log" );
+					}
+					buffer.append( temp );
 				}
-				buffer.append( temp );
+				buffer.append( "</activity>" );
+			} catch( ClearCaseException e ) {
+				logger.warning( "Unable to use activity \"" + act.getNormalizedName() + "\": " + e.getMessage() );
 			}
-			buffer.append( "</activity>" );
 		}
 		buffer.append( "</entry>" );
 		buffer.append( "</changeset>" );