[FIXED JENKINS-19519] support overrideable workspace separator

jenkinsci · Sep 9, 2013 · 775ae4e · 775ae4e
1 parent bd98df5
commit 775ae4e
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/main/java/hudson/plugins/perforce/PerforceSCM.java b/src/main/java/hudson/plugins/perforce/PerforceSCM.java
@@ -98,6 +98,8 @@ public class PerforceSCM extends SCM {
 
     private static final int MAX_CHANGESETS_ON_FIRST_BUILD = 50;
 
+    private static final String WORKSPACE_COMBINATOR = System.getProperty(hudson.slaves.WorkspaceList.class.getName(),"@");
+
     /**
      * Name of the p4 tool installation
      */
@@ -1751,7 +1753,7 @@ public static String unescapeP4String(String string) {
     private String getConcurrentClientName(FilePath workspace, String p4Client) {
         if (workspace != null) {
             // Match @ followed by an integer at the end of the workspace path
-            Pattern p = Pattern.compile(".*@(\\d+)$");
+            Pattern p = Pattern.compile(".*" + Pattern.quote(WORKSPACE_COMBINATOR) + "(\\d+)$");
             Matcher matcher = p.matcher(workspace.getRemote());
             if (matcher.find()) {
                 p4Client += "_" + matcher.group(1);