swapping order of param substitution when getting effective client name so build parameters are properly evaluated

Author: stuartrowe

src/main/java/hudson/plugins/perforce/PerforceSCM.java

@@ -1713,20 +1713,20 @@ private String getEffectiveClientName(AbstractBuild build, Map<String,String> en
         Node buildNode = build.getBuiltOn();
         FilePath workspace = build.getWorkspace();
         String p4Client = this.p4Client;
-        p4Client = MacroStringHelper.substituteParameters(p4Client, build, env);
         try {
             p4Client = getEffectiveClientName(p4Client, buildNode);
         } catch (Exception e) {
             new StreamTaskListener(System.out).getLogger().println(
                     "Could not get effective client name: " + e.getMessage());
         }
+        p4Client = MacroStringHelper.substituteParameters(p4Client, build, env);
         return p4Client;
     }
 
     private String getDefaultEffectiveClientName(AbstractProject project, Node buildNode, FilePath workspace)
             throws IOException, InterruptedException {
-        String basename = MacroStringHelper.substituteParametersNoCheck(this.p4Client, getDefaultSubstitutions(project));
-        return getEffectiveClientName(basename, buildNode);
+        String basename = getEffectiveClientName(this.p4Client, buildNode);
+        return MacroStringHelper.substituteParametersNoCheck(basename, getDefaultSubstitutions(project));
     }
 
     private String getEffectiveClientName(String basename, Node buildNode)