Merge branch 'JENKINS-42389'

jenkinsci · Mar 17, 2017 · f720699 · f720699
2 parents dbda755 + 3a4282f
commit f720699
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 3 deletions.
diff --git a/src/main/java/org/jenkinsci/plugins/configfiles/folder/FolderConfigFileProperty.java b/src/main/java/org/jenkinsci/plugins/configfiles/folder/FolderConfigFileProperty.java
@@ -6,14 +6,14 @@
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;
 import hudson.Extension;
-import hudson.model.Descriptor;
-import hudson.model.Item;
-import hudson.model.ItemGroup;
+import hudson.model.*;
+import net.sf.json.JSONObject;
 import org.jenkinsci.lib.configprovider.ConfigProvider;
 import org.jenkinsci.lib.configprovider.model.Config;
 import org.jenkinsci.plugins.configfiles.ConfigFileStore;
 import org.jenkinsci.plugins.configfiles.ConfigProviderComparator;
 import org.jenkinsci.plugins.configfiles.buildwrapper.ManagedFile;
+import org.kohsuke.stapler.StaplerRequest;
 
 import java.io.IOException;
 import java.util.*;
@@ -113,6 +113,10 @@ private Object readResolve() {
         return this;
     }
 
+    public FolderConfigFileProperty reconfigure(StaplerRequest req, JSONObject form) throws Descriptor.FormException {
+        return this;
+    }
+
     @Extension(optional = true)
     public static class DescriptorImpl extends AbstractFolderPropertyDescriptor {
 
@@ -122,4 +126,5 @@ public String getDisplayName() {
             return "";
         }
     }
+
 }
diff --git a/src/test/java/org/jenkinsci/plugins/configfiles/folder/FolderConfigFileActionTest.java b/src/test/java/org/jenkinsci/plugins/configfiles/folder/FolderConfigFileActionTest.java
@@ -1,6 +1,7 @@
 package org.jenkinsci.plugins.configfiles.folder;
 
 import com.cloudbees.hudson.plugins.folder.Folder;
+import org.hamcrest.Matchers;
 import org.jenkinsci.lib.configprovider.ConfigProvider;
 import org.jenkinsci.lib.configprovider.model.Config;
 import org.jenkinsci.plugins.configfiles.ConfigFileStore;
@@ -127,6 +128,16 @@ public void testSaveFolderConfigFiles() throws Exception {
 
     }
 
+    @Test
+    public void sameFolderPropertyAfterConfiguration() throws Exception {
+        Folder f1 = createFolder();
+        ConfigFileStore store = getStore(f1);
+
+        r.configRoundtrip(f1);
+
+        assertThat(store, Matchers.is(getStore(f1)));
+    }
+
     private CpsFlowDefinition getNewJobDefinition() {
         return new CpsFlowDefinition(""
                 + "node {\n" +