Use try-with-resources

apache · Jul 19, 2023 · bcd77d4 · bcd77d4
1 parent 4213170
commit bcd77d4
Showing 1 changed file with 16 additions and 21 deletions.
diff --git a/src/main/java/org/apache/commons/net/bsd/RCommandClient.java b/src/main/java/org/apache/commons/net/bsd/RCommandClient.java
@@ -216,31 +216,15 @@ public void connect(final String hostname, final int port, final InetAddress loc
     // port number limitations.
     @Override
     InputStream createErrorStream() throws IOException {
-        int localPort;
         final Socket socket;
 
-        ServerSocket server = null;
-
-        for (localPort = MAX_CLIENT_PORT; localPort >= MIN_CLIENT_PORT; --localPort) {
-            try {
-                server = _serverSocketFactory_.createServerSocket(localPort, 1, getLocalAddress());
-                break; // got a socket
-            } catch (final SocketException e) {
-                continue;
-            }
-        }
-
-        if (server == null) {
-            throw new BindException("All ports in use.");
+        try (ServerSocket server = createServer()) {
+            _output_.write(Integer.toString(server.getLocalPort()).getBytes(StandardCharsets.UTF_8));
+            _output_.write(NULL_CHAR);
+            _output_.flush();
+            socket = server.accept();
         }
 
-        _output_.write(Integer.toString(server.getLocalPort()).getBytes(StandardCharsets.UTF_8)); // $NON-NLS
-        _output_.write(NULL_CHAR);
-        _output_.flush();
-
-        socket = server.accept();
-        server.close();
-
         if (isRemoteVerificationEnabled() && !verifyRemote(socket)) {
             socket.close();
             throw new IOException("Security violation: unexpected connection attempt by " + socket.getInetAddress().getHostAddress());
@@ -249,6 +233,17 @@ InputStream createErrorStream() throws IOException {
         return new SocketInputStream(socket, socket.getInputStream());
     }
 
+    private ServerSocket createServer() throws IOException {
+        for (int localPort = MAX_CLIENT_PORT; localPort >= MIN_CLIENT_PORT; --localPort) {
+            try {
+                return _serverSocketFactory_.createServerSocket(localPort, 1, getLocalAddress());
+            } catch (final SocketException e) {
+                continue;
+            }
+        }
+        throw new BindException("All ports in use.");
+    }
+
     /**
      * Same as <code> rcommand(localUsername, remoteUsername, command, false); </code>
      *