Fix issue terabyte#31: editing a repo config as non-system-admin when…

… locked fails
memory · Nov 18, 2015 · 3dc1533 · 3dc1533
1 parent 5f603f3
commit 3dc1533
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/src/main/java/com/palantir/stash/stashbot/servlet/RepoConfigurationServlet.java b/src/main/java/com/palantir/stash/stashbot/servlet/RepoConfigurationServlet.java
@@ -212,6 +212,13 @@ public void doPost(HttpServletRequest req, HttpServletResponse res) throws Servl
             try {
                 RepositoryConfiguration rc =
                     configurationPersistanceManager.getRepositoryConfigurationForRepository(rep);
+
+                // if no jenkinsServerName is provided, assume it is unchanged and fill in the old value
+                // When the javascript disabled the field, this can cause the parameter to be left out, leaving a null value.
+                if (jenkinsServerName == null) {
+                    jenkinsServerName = rc.getJenkinsServerName();
+                }
+
                 JenkinsServerConfiguration oldConfig =
                     configurationPersistanceManager.getJenkinsServerConfiguration(rc.getJenkinsServerName());
                 JenkinsServerConfiguration newConfig =