Fixed a socket file descriptor leak.

changelog.html

@@ -58,6 +58,8 @@ Upcoming changes</a>
   <li class=bug>
     Computer.getHostName() returns null when it is not.
     (<a href="https://issues.jenkins-ci.org/browse/JENKINS-13185">issue 13185</a>)  
+  <li class=bug>
+    Fixed a socket file descriptor leak.
   <li class=rfe>
     Improved the page loading performance, especially on large latency network
 </ul>

cli/src/main/java/hudson/cli/CLI.java

@@ -184,11 +184,6 @@ public class CLI {
             // HTTP proxies (at least the one I tried --- squid) doesn't seem to do half-close very well.
             // So instead of relying on it, we'll just send the close command and then let the server
             // cut their side, then close the socket after the join.
-            closables.add(new Closeable() {
-                public void close() throws IOException {
-                    s.close();
-                }
-            });
             out = new SocketOutputStream(s) {
                 @Override
                 public void close() throws IOException {
@@ -201,6 +196,12 @@ public class CLI {
             out = new SocketOutputStream(s);
         }
 
+        closables.add(new Closeable() {
+            public void close() throws IOException {
+                s.close();
+            }
+        });
+
         DataOutputStream dos = new DataOutputStream(s.getOutputStream());
         dos.writeUTF("Protocol:CLI-connect");
 

pom.xml

@@ -189,7 +189,7 @@ THE SOFTWARE.
       <dependency>
         <groupId>org.jenkins-ci.main</groupId>
         <artifactId>remoting</artifactId>
-        <version>2.12</version>
+        <version>2.13</version>
       </dependency>
 
       <dependency>