Use Closer.closeSilently
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/ab1672c7 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/ab1672c7 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/ab1672c7 Branch: refs/heads/master Commit: ab1672c71595f772f488f871627a8affe8247358 Parents: 5bc69e2 Author: Matt Sicker <[email protected]> Authored: Tue Jan 3 21:42:42 2017 -0600 Committer: Matt Sicker <[email protected]> Committed: Tue Jan 3 21:42:42 2017 -0600 ---------------------------------------------------------------------- .../apache/logging/log4j/core/net/server/TcpSocketServer.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ab1672c7/log4j-core/src/main/java/org/apache/logging/log4j/core/net/server/TcpSocketServer.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/server/TcpSocketServer.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/server/TcpSocketServer.java index e86b382..68ac1ba 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/server/TcpSocketServer.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/server/TcpSocketServer.java @@ -32,6 +32,7 @@ import com.beust.jcommander.Parameter; import com.beust.jcommander.validators.PositiveInteger; import org.apache.logging.log4j.core.config.ConfigurationFactory; import org.apache.logging.log4j.core.util.BasicCommandLineArguments; +import org.apache.logging.log4j.core.util.Closer; import org.apache.logging.log4j.core.util.Log4jThread; import org.apache.logging.log4j.message.EntryMessage; @@ -91,11 +92,7 @@ public class TcpSocketServer<T extends InputStream> extends AbstractSocketServer logger.error("IOException encountered while reading from socket", e); } if (!closed) { - try { - inputStream.close(); - } catch (final Exception ignored) { - // Ignore the exception; - } + Closer.closeSilently(inputStream); } } finally { handlers.remove(Long.valueOf(getId()));
