fixing JENKINS-25366

morficus · morficus · commit 3f823328a138 · 2015-05-12T14:59:02.000-04:00
* if params are to be loaded from a file, force `this.parameters` to an empty string.
diff --git a/src/main/java/org/jenkinsci/plugins/ParameterizedRemoteTrigger/RemoteBuildConfiguration.java b/src/main/java/org/jenkinsci/plugins/ParameterizedRemoteTrigger/RemoteBuildConfiguration.java
@@ -89,7 +89,6 @@ public RemoteBuildConfiguration(String remoteJenkinsName, boolean shouldNotFailB
 
         this.token = token.trim();
         this.remoteJenkinsName = remoteJenkinsName;
-        this.parameters = parameters;
         this.job = job.trim();
         this.shouldNotFailBuild = shouldNotFailBuild;
         this.preventRemoteBuildQueue = preventRemoteBuildQueue;
@@ -115,6 +114,7 @@ public RemoteBuildConfiguration(String remoteJenkinsName, boolean shouldNotFailB
             }
         } else {
             this.loadParamsFromFile = false;
+            this.parameters = parameters;
         }
 
         // TODO: clean this up a bit

Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,6 @@ public RemoteBuildConfiguration(String remoteJenkinsName, boolean shouldNotFailB`
`89`	`89`
`90`	`90`	`this.token = token.trim();`
`91`	`91`	`this.remoteJenkinsName = remoteJenkinsName;`
`92`		`- this.parameters = parameters;`
`93`	`92`	`this.job = job.trim();`
`94`	`93`	`this.shouldNotFailBuild = shouldNotFailBuild;`
`95`	`94`	`this.preventRemoteBuildQueue = preventRemoteBuildQueue;`
`@@ -115,6 +114,7 @@ public RemoteBuildConfiguration(String remoteJenkinsName, boolean shouldNotFailB`
`115`	`114`	`}`
`116`	`115`	`} else {`
`117`	`116`	`this.loadParamsFromFile = false;`
	`117`	`+ this.parameters = parameters;`
`118`	`118`	`}`
`119`	`119`
`120`	`120`	`// TODO: clean this up a bit`