You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by gg...@apache.org on 2017/06/29 20:35:14 UTC
logging-log4j2 git commit: Reuse Closer.closeSilently().
Repository: logging-log4j2
Updated Branches:
refs/heads/master 3caaba0d4 -> bc6c0197a
Reuse 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/bc6c0197
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/bc6c0197
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/bc6c0197
Branch: refs/heads/master
Commit: bc6c0197aafffc0e714a132fc74ae4e75a781355
Parents: 3caaba0
Author: Gary Gregory <gg...@apache.org>
Authored: Thu Jun 29 13:35:11 2017 -0700
Committer: Gary Gregory <gg...@apache.org>
Committed: Thu Jun 29 13:35:11 2017 -0700
----------------------------------------------------------------------
.../org/apache/logging/log4j/core/net/TcpSocketManager.java | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/bc6c0197/log4j-core/src/main/java/org/apache/logging/log4j/core/net/TcpSocketManager.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/TcpSocketManager.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/TcpSocketManager.java
index 481f59f..8374ff9 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/TcpSocketManager.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/TcpSocketManager.java
@@ -310,12 +310,7 @@ public class TcpSocketManager extends AbstractSocketManager {
@SuppressWarnings("resource") // newOS is managed by the enclosing Manager.
final OutputStream newOS = sock.getOutputStream();
synchronized (owner) {
- try {
- getOutputStream().close();
- } catch (final IOException ioe) {
- // Ignore this.
- }
-
+ Closer.closeSilently(getOutputStream());
setOutputStream(newOS);
socket = sock;
reconnector = null;