Author: raggz Date: 2011-11-30 16:00:58 -0500 (Wed, 30 Nov 2011) New Revision: 6422 Modified: remoting2/branches/2.5.4.SP2_JBREM-1297/ remoting2/branches/2.5.4.SP2_JBREM-1297/src/main/org/jboss/remoting/ConnectionValidator.java Log: JBPAPP-7631; Back port JBREM-1297 - part3. Property changes on: remoting2/branches/2.5.4.SP2_JBREM-1297 ___________________________________________________________________ Modified: svn:mergeinfo - /remoting2/branches/2.x:6401-6402 + /remoting2/branches/2.x:6401-6402,6405 Modified: remoting2/branches/2.5.4.SP2_JBREM-1297/src/main/org/jboss/remoting/ConnectionValidator.java =================================================================== --- remoting2/branches/2.5.4.SP2_JBREM-1297/src/main/org/jboss/remoting/ConnectionValidator.java 2011-11-30 20:54:32 UTC (rev 6421) +++ remoting2/branches/2.5.4.SP2_JBREM-1297/src/main/org/jboss/remoting/ConnectionValidator.java 2011-11-30 21:00:58 UTC (rev 6422) @@ -1077,9 +1077,8 @@ { log.debug(ConnectionValidator.this + " shutting down lease pinger: " + leasePinger); int disconnectTimeout = (failureDisconnectTimeout == -1) ? client.getDisconnectTimeout() : failureDisconnectTimeout; - if (trace) log.trace(ConnectionValidator.this + " disconnectTimeout: " + disconnectTimeout); + if (trace) log.trace(ConnectionValidator.this + " disconnectTimeout: " + disconnectTimeout); - // Synchronizing on Client.connectionValidatorLock to prevent a deadlock: // // 1. a. This method calls MicroRemoteClientInvoker.terminateLease()