diff --git a/core/src/main/java/hudson/TcpSlaveAgentListener.java b/core/src/main/java/hudson/TcpSlaveAgentListener.java index 26fc5942ce..c26eda6666 100644 --- a/core/src/main/java/hudson/TcpSlaveAgentListener.java +++ b/core/src/main/java/hudson/TcpSlaveAgentListener.java @@ -50,12 +50,15 @@ public class TcpSlaveAgentListener extends Thread { private volatile boolean shuttingDown; private final String secretKey; + public final int configuredPort; + /** * @param port * Use 0 to choose a random port. */ public TcpSlaveAgentListener(int port) throws IOException { serverSocket = new ServerSocket(port); + this.configuredPort = port; LOGGER.info("JNLP slave agent listener started on TCP port "+getPort()); diff --git a/core/src/main/java/hudson/model/Hudson.java b/core/src/main/java/hudson/model/Hudson.java index 88ed9be56c..eafab50e11 100644 --- a/core/src/main/java/hudson/model/Hudson.java +++ b/core/src/main/java/hudson/model/Hudson.java @@ -159,7 +159,7 @@ public final class Hudson extends View implements ItemGroup, Node */ public transient final PluginManager pluginManager; - public transient final TcpSlaveAgentListener tcpSlaveAgentListener; + public transient volatile TcpSlaveAgentListener tcpSlaveAgentListener; /** * List of registered {@link JobListener}s. @@ -922,6 +922,19 @@ public final class Hudson extends View implements ItemGroup, Node throw new FormException("Bad port number "+req.getParameter("slaveAgentPort"),"slaveAgentPort"); } } + + // relaunch the agent + if(tcpSlaveAgentListener==null) { + if(slaveAgentPort!=-1) + tcpSlaveAgentListener = new TcpSlaveAgentListener(slaveAgentPort); + } else { + if(tcpSlaveAgentListener.configuredPort!=slaveAgentPort) { + tcpSlaveAgentListener.shutdown(); + tcpSlaveAgentListener = null; + if(slaveAgentPort!=-1) + tcpSlaveAgentListener = new TcpSlaveAgentListener(slaveAgentPort); + } + } } numExecutors = Integer.parseInt(req.getParameter("numExecutors"));