[JENKINS-41511] Don't try to set slaveAgentPort when it is enforced

(cherry picked from commit 5b9c10d)
jenkinsci · Feb 15, 2017 · 19d2b2c · 19d2b2c
1 parent e46099a
commit 19d2b2c
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/core/src/main/java/hudson/security/GlobalSecurityConfiguration.java b/core/src/main/java/hudson/security/GlobalSecurityConfiguration.java
@@ -79,7 +79,7 @@ public int getSlaveAgentPort() {
      * @since 2.24
      * @return true if the slave agent port is enforced on this instance.
      */
-    @Restricted(DoNotUse.class) // only for index.groovy
+    @Restricted(NoExternalUse.class) // only for index.groovy
     public boolean isSlaveAgentPortEnforced() {
         return Jenkins.getInstance().isSlaveAgentPortEnforced();
     }
@@ -114,10 +114,12 @@ public boolean configure(StaplerRequest req, JSONObject json) throws hudson.mode
             j.setDisableRememberMe(security.optBoolean("disableRememberMe", false));
             j.setSecurityRealm(SecurityRealm.all().newInstanceFromRadioList(security, "realm"));
             j.setAuthorizationStrategy(AuthorizationStrategy.all().newInstanceFromRadioList(security, "authorization"));
-            try {
-                j.setSlaveAgentPort(new ServerTcpPort(security.getJSONObject("slaveAgentPort")).getPort());
-            } catch (IOException e) {
-                throw new hudson.model.Descriptor.FormException(e, "slaveAgentPortType");
+            if (!isSlaveAgentPortEnforced()) {
+                try {
+                    j.setSlaveAgentPort(new ServerTcpPort(security.getJSONObject("slaveAgentPort")).getPort());
+                } catch (IOException e) {
+                    throw new hudson.model.Descriptor.FormException(e, "slaveAgentPortType");
+                }
             }
             Set<String> agentProtocols = new TreeSet<>();
             if (security.has("agentProtocol")) {