At the moment we have a SCM that doesn't require a workspace to poll …

…for changes the ws will be null [FIXED JENKINS-25253]
jenkinsci · Apr 3, 2016 · 48aeb95 · 48aeb95
1 parent 0cd660a
commit 48aeb95
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/main/java/org/jenkinsci/plugins/multiplescms/MultiSCMRevisionState.java b/src/main/java/org/jenkinsci/plugins/multiplescms/MultiSCMRevisionState.java
@@ -22,9 +22,10 @@ public void add(@NonNull SCM scm, @NonNull FilePath ws, @Nullable Run<?,?> build
         revisionStates.put(scm.getKey(), scmState);
     }
 
-    public SCMRevisionState get(@NonNull SCM scm, @NonNull FilePath ws, @Nullable AbstractBuild<?,?> build) {
+    public SCMRevisionState get(@NonNull SCM scm, FilePath ws, @Nullable AbstractBuild<?,?> build) {
         SCMRevisionState state = revisionStates.get(scm.getKey());
-        if (state == null) {
+        // At the moment we have a SCM that doesn't require a workspace ws will be null
+        if (state == null && ws != null) {
             // backward compatibility with 0.2
             state = revisionStates.get(keyFor(scm, ws, build));
         }