Repository: logging-log4j-tools Updated Branches: refs/heads/master ff1937a79 -> ae46a9a37
[LOG4J2-1994] TcpSocketServer does not close accepted Sockets. Project: http://git-wip-us.apache.org/repos/asf/logging-log4j-tools/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j-tools/commit/ae46a9a3 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j-tools/tree/ae46a9a3 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j-tools/diff/ae46a9a3 Branch: refs/heads/master Commit: ae46a9a373542fa8395794027ffef3b9d9781a24 Parents: ff1937a Author: Gary Gregory <[email protected]> Authored: Fri Jul 28 16:05:17 2017 -0700 Committer: Gary Gregory <[email protected]> Committed: Fri Jul 28 16:05:17 2017 -0700 ---------------------------------------------------------------------- .../java/org/apache/logging/log4j/server/TcpSocketServer.java | 5 +++++ 1 file changed, 5 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j-tools/blob/ae46a9a3/log4j-server/src/main/java/org/apache/logging/log4j/server/TcpSocketServer.java ---------------------------------------------------------------------- diff --git a/log4j-server/src/main/java/org/apache/logging/log4j/server/TcpSocketServer.java b/log4j-server/src/main/java/org/apache/logging/log4j/server/TcpSocketServer.java index 4d8146b..af458f8 100644 --- a/log4j-server/src/main/java/org/apache/logging/log4j/server/TcpSocketServer.java +++ b/log4j-server/src/main/java/org/apache/logging/log4j/server/TcpSocketServer.java @@ -71,10 +71,12 @@ public class TcpSocketServer<T extends InputStream> extends AbstractSocketServer private class SocketHandler extends Log4jThread { private final T inputStream; + private final Socket socket; private volatile boolean shutdown = false; public SocketHandler(final Socket socket) throws IOException { + this.socket = socket; this.inputStream = logEventInput.wrapStream(socket.getInputStream()); } @@ -107,6 +109,9 @@ public class TcpSocketServer<T extends InputStream> extends AbstractSocketServer public void shutdown() { this.shutdown = true; + if (socket != null) { + Closer.closeSilently(socket); + } interrupt(); } }
