Merge pull request #13 from escoem/JENKINS-38418

escoem · web-flow · commit 3c97d15e6636 · 2017-02-10T12:12:59.000+01:00
[FIXED JENKINS-38418] Failed to load persisted workflow state (remote-loader). Thanks @oleg-nenashev
diff --git a/src/main/java/org/jenkinsci/plugins/workflow/remoteloader/GroovyFileGlobalVariable.java b/src/main/java/org/jenkinsci/plugins/workflow/remoteloader/GroovyFileGlobalVariable.java
@@ -45,7 +45,7 @@ public abstract class GroovyFileGlobalVariable extends GlobalVariable {
      */
     @Nonnull
     public String getClassName() {
-        return getClass().getName() + ".Impl";
+        return getClass().getName() + ".FileLoaderDSLImpl";
     }
 
     @Override 
diff --git a/src/main/resources/org/jenkinsci/plugins/workflow/remoteloader/FileLoaderDSL/FileLoaderDSLImpl.groovy b/src/main/resources/org/jenkinsci/plugins/workflow/remoteloader/FileLoaderDSL/FileLoaderDSLImpl.groovy
@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.jenkinsci.plugins.workflow.remoteloader
+package org.jenkinsci.plugins.workflow.remoteloader.FileLoaderDSL
 
 import org.jenkinsci.plugins.workflow.cps.CpsScript;
 

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ public abstract class GroovyFileGlobalVariable extends GlobalVariable {`
`45`	`45`	`*/`
`46`	`46`	`@Nonnull`
`47`	`47`	`public String getClassName() {`
`48`		`- return getClass().getName() + ".Impl";`
	`48`	`+ return getClass().getName() + ".FileLoaderDSLImpl";`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`@Override`