In checkout(), catch ClassCastException for MultiSCMRevisionState

[FIXED JENKINS-27638]
jenkinsci · May 20, 2015 · b25484f · b25484f
1 parent 39a2d3b
commit b25484f
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/src/main/java/org/jenkinsci/plugins/multiplescms/MultiSCM.java b/src/main/java/org/jenkinsci/plugins/multiplescms/MultiSCM.java
@@ -103,8 +103,13 @@ public void checkout(Run<?, ?> build, Launcher launcher,
 			FilePath workspace, TaskListener listener, File changelogFile, SCMRevisionState baseline)
 			throws IOException, InterruptedException {
 
-        MultiSCMRevisionState oldBaseline = (MultiSCMRevisionState) baseline;
-		MultiSCMRevisionState revisionState = new MultiSCMRevisionState();		
+		MultiSCMRevisionState oldBaseline = null;
+		try {
+			oldBaseline = (MultiSCMRevisionState) baseline;
+                } catch (ClassCastException e) {
+			oldBaseline = new MultiSCMRevisionState();
+                }
+		MultiSCMRevisionState revisionState = new MultiSCMRevisionState();
 		build.addAction(revisionState);
 
 		HashSet<Object> scmActions = new HashSet<Object>();