Skip to content
Permalink
Browse files
Merge pull request #20 from rym002/JENKINS-25247
Fix NPE with ignoreparent
  • Loading branch information
rym002 committed Sep 8, 2015
2 parents 478b987 + 6ed7e42 commit 7176f285d051e4c3541e4e7c77d4db3bf9f877c4
Showing 1 changed file with 9 additions and 2 deletions.
@@ -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 {

0 comments on commit 7176f28

Please sign in to comment.