Merge pull request #20 from rym002/JENKINS-25247

Fix NPE with ignoreparent
jenkinsci · Sep 8, 2015 · 7176f28 · 7176f28
2 parents 478b987 + 6ed7e42
commit 7176f28
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/src/main/java/hudson/plugins/accurev/delegates/WorkspaceDelegate.java b/src/main/java/hudson/plugins/accurev/delegates/WorkspaceDelegate.java
@@ -68,8 +68,15 @@ protected Relocation checkForRelocation() throws IOException, InterruptedExcepti
             if (!workspaceStreams.isEmpty()) {
                 AccurevStream workspaceStream = workspaceStreams.values().iterator().next();
                 accurevWorkspace.setStream(workspaceStream);
-                workspaceStream.setParent(streams.get(workspaceStream.getBasisName()));
-            }else{
+                String workspaceBasisStream = workspaceStream.getBasisName();
+                if (streams.containsKey(workspaceBasisStream)) {
+                    workspaceStream.setParent(streams.get(workspaceBasisStream));
+                } else {
+                    Map<String, AccurevStream> workspaceBasis = ShowStreams.getStreams(scm, workspaceBasisStream, server, accurevEnv, jenkinsWorkspace, listener, accurevPath,
+                            launcher);
+                    workspaceStream.setParent(workspaceBasis.get(workspaceBasisStream));
+                }
+            } else {
                 throw new IllegalArgumentException("Workspace stream not found " + _accurevWorkspace);
             }
         } else {