Author: ron.sigal(a)jboss.com Date: 2009-05-06 04:42:04 -0400 (Wed, 06 May 2009) New Revision: 5142 Modified: remoting2/branches/2.2.2-SP11_JBREM-1112/src/main/org/jboss/remoting/Client.java Log: JBREM-1112 (and others to be named): Updated some logging statements. Modified: remoting2/branches/2.2.2-SP11_JBREM-1112/src/main/org/jboss/remoting/Client.java =================================================================== --- remoting2/branches/2.2.2-SP11_JBREM-1112/src/main/org/jboss/remoting/Client.java 2009-05-06 04:28:37 UTC (rev 5141) +++ remoting2/branches/2.2.2-SP11_JBREM-1112/src/main/org/jboss/remoting/Client.java 2009-05-06 08:42:04 UTC (rev 5142) @@ -463,8 +463,10 @@ isRemoved = connectionValidator.removeConnectionListener(this, listener); if (connectionValidator.isStopped()) { - connectionValidators.remove(connectionValidatorKey); - log.debug(this + " removed from static map: " + connectionValidator); + if (connectionValidators.remove(connectionValidatorKey) != null) + { + log.debug(this + ".removeConnectionListener() removed from static map: " + connectionValidator); + } connectionValidator = null; connectionValidatorKey = null; } @@ -604,8 +606,10 @@ } if (connectionValidator.isStopped()) { - connectionValidators.remove(connectionValidatorKey); - log.debug(this + " removed from static map: " + connectionValidator); + if (connectionValidators.remove(connectionValidatorKey) != null) + { + log.debug(this + ".disconnect() removed from static map: " + connectionValidator); + } } } // connectionValidator.stop(); @@ -1646,7 +1650,7 @@ // synchronized (connectionValidatorLock) { // disconnect(); - log.debug(this + " entering notifyAndDisconnect()"); + log.debug(this + " entering notifyAndDisconnect(): " + connectionValidator); if (connectionValidator != null) { synchronized (connectionValidator) @@ -1666,8 +1670,10 @@ ConnectionListener listener = (ConnectionListener) it.next(); connectionValidator.removeConnectionListener(this, listener); } - connectionValidators.remove(connectionValidatorKey); - log.debug(this + " removed from static map: " + connectionValidator); + if (connectionValidators.remove(connectionValidatorKey) != null) + { + log.debug(this + ".notifyAndDisconnect() removed from static map: " + connectionValidator); + } } } connectionValidator = null;