fix: local identifier argument not being identified properly

rchougule · rchougule · commit 77070c9a371a · 2020-12-16T23:34:35.000+05:30
diff --git a/src/main/java/com/browserstack/automate/ci/jenkins/local/JenkinsBrowserStackLocal.java b/src/main/java/com/browserstack/automate/ci/jenkins/local/JenkinsBrowserStackLocal.java
@@ -64,7 +64,6 @@ private String[] processLocalArguments(final String argString, String buildTag)
                     localIdentifier = args[i + 1];
                     if (StringUtils.isNotBlank(localIdentifier)) {
                         localIdentifierOverriden = true;
-                        continue;
                     }
 
                     // skip next, since already processed
@@ -84,11 +83,14 @@ private String[] processLocalArguments(final String argString, String buildTag)
 
             arguments.add(args[i]);
         }
+
         if (!localIdentifierOverriden) {
             localIdentifier = UUID.randomUUID().toString() + "-" + buildTag.replaceAll("[^\\w\\-\\.]", "_");
-            arguments.add(localIdPos, localIdentifier);
-            arguments.add(localIdPos, "-" + OPTION_LOCAL_IDENTIFIER);
         }
+
+        arguments.add(localIdPos, localIdentifier);
+        arguments.add(localIdPos, "-" + OPTION_LOCAL_IDENTIFIER);
+
         return arguments.toArray(new String[]{});
     }
 

Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,6 @@ private String[] processLocalArguments(final String argString, String buildTag)`
`64`	`64`	`localIdentifier = args[i + 1];`
`65`	`65`	`if (StringUtils.isNotBlank(localIdentifier)) {`
`66`	`66`	`localIdentifierOverriden = true;`
`67`		`- continue;`
`68`	`67`	`}`
`69`	`68`
`70`	`69`	`// skip next, since already processed`
`@@ -84,11 +83,14 @@ private String[] processLocalArguments(final String argString, String buildTag)`
`84`	`83`
`85`	`84`	`arguments.add(args[i]);`
`86`	`85`	`}`
	`86`	`+`
`87`	`87`	`if (!localIdentifierOverriden) {`
`88`	`88`	`localIdentifier = UUID.randomUUID().toString() + "-" + buildTag.replaceAll("[^\\w\\-\\.]", "_");`
`89`		`- arguments.add(localIdPos, localIdentifier);`
`90`		`- arguments.add(localIdPos, "-" + OPTION_LOCAL_IDENTIFIER);`
`91`	`89`	`}`
	`90`	`+`
	`91`	`+ arguments.add(localIdPos, localIdentifier);`
	`92`	`+ arguments.add(localIdPos, "-" + OPTION_LOCAL_IDENTIFIER);`
	`93`	`+`
`92`	`94`	`return arguments.toArray(new String[]{});`
`93`	`95`	`}`
`94`	`96`