Do not change the workspace root during polling.

JENKINS-48434
jenkinsci · Feb 16, 2018 · 2ec2dcc · 2ec2dcc
1 parent 46e2d35
commit 2ec2dcc
Showing 1 changed file with 2 additions and 7 deletions.
diff --git a/src/main/java/org/jenkinsci/plugins/p4/PerforceScm.java b/src/main/java/org/jenkinsci/plugins/p4/PerforceScm.java
@@ -355,15 +355,10 @@ private PollingResult pollWorkspace(EnvVars envVars, TaskListener listener, File
 		envVars.put("EXECUTOR_NUMBER", envVars.get("EXECUTOR_NUMBER", executor));
 
 		Workspace ws = (Workspace) workspace.clone();
-		String root = buildWorkspace.getRemote();
-		if (root.contains("@")) {
-			root = root.replace("@", "%40");
-		}
-		ws.setRootPath(root);
+		// JENKINS-48434 by setting rootPath to null will leave client's root unchanged
+		ws.setRootPath(null);
 		ws.setExpand(envVars);
 
-		// don't call setRootPath() here, polling is often on the master
-
 		// Set EXPANDED client
 		String client = ws.getFullName();
 		String syncID = ws.getSyncID();