Repository: incubator-geode Updated Branches: refs/heads/develop b2b2de8b2 -> c67a08fcd
GEODE-485: Logging at debug level on a SocketException while closing the connection This avoids any suspect strings written to logs. Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/59de5551 Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/59de5551 Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/59de5551 Branch: refs/heads/develop Commit: 59de5551e77fbcc1b37227520807834ce45da6da Parents: fc4bbfc Author: Sai Boorlagadda <[email protected]> Authored: Wed Oct 28 11:37:49 2015 -0700 Committer: Sai Boorlagadda <[email protected]> Committed: Fri Oct 30 11:59:56 2015 -0700 ---------------------------------------------------------------------- .../cache/client/internal/pooling/ConnectionManagerImpl.java | 5 +++++ 1 file changed, 5 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/59de5551/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/internal/pooling/ConnectionManagerImpl.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/internal/pooling/ConnectionManagerImpl.java b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/internal/pooling/ConnectionManagerImpl.java index 5f6dc25..83e4878 100644 --- a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/internal/pooling/ConnectionManagerImpl.java +++ b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/internal/pooling/ConnectionManagerImpl.java @@ -43,6 +43,7 @@ import com.gemstone.gemfire.internal.logging.log4j.LocalizedMessage; import com.gemstone.gemfire.security.GemFireSecurityException; import com.gemstone.org.jgroups.util.StringId; +import java.net.SocketException; import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; @@ -1171,6 +1172,10 @@ public class ConnectionManagerImpl implements ConnectionManager { if (!pc.isDestroyed()) { try { pc.internalClose(keepAlive); + } catch(SocketException se) { + logger.info(LocalizedMessage.create( + LocalizedStrings.ConnectionManagerImpl_ERROR_CLOSING_CONNECTION_TO_SERVER_0, + pc.getServer()), se); } catch(Exception e) { logger.warn(LocalizedMessage.create( LocalizedStrings.ConnectionManagerImpl_ERROR_CLOSING_CONNECTION_TO_SERVER_0,
