Prevent NPE on paths with @ in the parent.

JENKINS-40055
jenkinsci · Jan 5, 2017 · c6a01fe · c6a01fe
1 parent 84a13eb
commit c6a01fe
Showing 1 changed file with 21 additions and 15 deletions.
diff --git a/src/main/java/org/jenkinsci/plugins/p4/tasks/AbstractTask.java b/src/main/java/org/jenkinsci/plugins/p4/tasks/AbstractTask.java
@@ -102,24 +102,30 @@ public Workspace setEnvironment(Run<?, ?> run, Workspace wsType, FilePath buildW
 		String root = buildWorkspace.getRemote();
 		if (root.contains("@")) {
 			root = root.replace("@", "%40");
-			String client = ws.getFullName();
-			String name = buildWorkspace.getName();
+		}
+
+		// Template workspace for parallel execution
+		String name = buildWorkspace.getName();
+		if (name.contains("@")) {
 			String[] parts = name.split("@");
-			String exec = parts[1];
+			if (parts.length == 2) {
+				String exec = parts[1];
 
-			// Update Workspace before cloning
-			setWorkspace(ws);
+				// Update Workspace before cloning
+				setWorkspace(ws);
 
-			// Template workspace to .cloneN (where N is the @ number)
-			try {
-				int n = Integer.parseInt(exec);
-				String charset = ws.getCharset();
-				boolean pin = ws.isPinHost();
-				String template = client + ".clone" + n;
-				ws = new TemplateWorkspaceImpl(charset, pin, client, template);
-				ws.setExpand(envVars);
-			} catch (NumberFormatException e) {
-				// do not template; e.g. 'script' keeps original name
+				// Template workspace to .cloneN (where N is the @ number)
+				try {
+					int n = Integer.parseInt(exec);
+					String charset = ws.getCharset();
+					boolean pin = ws.isPinHost();
+					String fullName = ws.getFullName();
+					String template = fullName + ".clone" + n;
+					ws = new TemplateWorkspaceImpl(charset, pin, fullName, template);
+					ws.setExpand(envVars);
+				} catch (NumberFormatException e) {
+					// do not template; e.g. 'script' keeps original name
+				}
 			}
 		}
 		ws.setRootPath(root);