From df5f7150900c8a63bcf660699b9190ca79ba450c Mon Sep 17 00:00:00 2001 From: Daan Hoogland Date: Fri, 10 Jul 2015 16:45:16 +0200 Subject: [PATCH] coverity 1148416: auto close server socket Signed-off-by: Daan Hoogland This closes #578 --- .../src/main/java/streamer/debug/MockServer.java | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/debug/MockServer.java b/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/debug/MockServer.java index 348a006c1aa..6b6acab6068 100644 --- a/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/debug/MockServer.java +++ b/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/debug/MockServer.java @@ -59,11 +59,10 @@ public class MockServer implements Runnable { @Override public void run() { - try { - Socket socket = serverSocket.accept(); + try (Socket socket = serverSocket.accept();) { if (verbose) - System.out.println("[" + this + "] INFO: Clien connected: " + socket.getRemoteSocketAddress() + "."); + System.out.println("[" + this + "] INFO: Client connected: " + socket.getRemoteSocketAddress() + "."); InputStream is = socket.getInputStream(); OutputStream os = socket.getOutputStream(); @@ -137,10 +136,6 @@ public class MockServer implements Runnable { os.close(); } catch (Throwable e) { } - try { - socket.close(); - } catch (Throwable e) { - } try { serverSocket.close(); } catch (Throwable e) {