November 2011 - jboss-remoting-commits

JBoss Remoting SVN: r6422 - in remoting2/branches/2.5.4.SP2_JBREM-1297: src/main/org/jboss/remoting and 1 other directory.

by jboss-remoting-commits＠lists.jboss.org

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()

13 years, 1 month

1
0
0 / 0

JBoss Remoting SVN: r6421 - in remoting2/branches/2.5.4.SP2_JBREM-1297: src/main/org/jboss/remoting and 1 other directory.

by jboss-remoting-commits＠lists.jboss.org

Author: raggz Date: 2011-11-30 15:54:32 -0500 (Wed, 30 Nov 2011) New Revision: 6421 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 - part2. Property changes on: remoting2/branches/2.5.4.SP2_JBREM-1297 ___________________________________________________________________ Modified: svn:mergeinfo - /remoting2/branches/2.x:6401 + /remoting2/branches/2.x:6401-6402 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:52:18 UTC (rev 6420) +++ remoting2/branches/2.5.4.SP2_JBREM-1297/src/main/org/jboss/remoting/ConnectionValidator.java 2011-11-30 20:54:32 UTC (rev 6421) @@ -1078,7 +1078,36 @@ log.debug(ConnectionValidator.this + " shutting down lease pinger: " + leasePinger); int disconnectTimeout = (failureDisconnectTimeout == -1) ? client.getDisconnectTimeout() : failureDisconnectTimeout; if (trace) log.trace(ConnectionValidator.this + " disconnectTimeout: " + disconnectTimeout); - sharedInvoker.terminateLease(null, disconnectTimeout, leasePinger); + + + // Synchronizing on Client.connectionValidatorLock to prevent a deadlock: + // + // 1. a. This method calls MicroRemoteClientInvoker.terminateLease() + // b. MicroRemoteClientInvoker.terminateLease() synchronizes on MicroRemoteClientInvoker.clientLeaseLock + // c. MicroRemoteClientInvoker.terminateLease() calls LeasePinger.stopPing() + // d. LeasePinger.stopPing() calls Client.notifyListeners() + // e. Client.notifyListeners() synchronizes on Client.connectionValidatorLock + // + // 2. a. Client.connect() calls Client.setupClientLease() + // b. Client.setupClientLease() synchronizes on Client.connectionValidatorLock + // c. Client.setupClientLease() calls MicroRemoteClientInvoker.establishLease() + // d. MicroRemoteClientInvoker.establishLease() synchronizes on MicroRemoteClientInvoker.clientLeaseLock + // e. MicroRemoteClientInvoker.establishLease() calls Client.addConnectionListener() + // f. Client.addConnectionListener() synchronizes on Client.connectionValidatorLock + // + // 3. a. Client.addConnectionListener() synchronizes on Client.connectionValidatorLock + // b. Client.addConnectionListener() calls new ConnectionValidator() + // c. new ConnectionValidator() calls MicroRemoteClientInvoker.getLeasePinger() + // d. MicroRemoteClientInvoker.getLeasePinger() synchronizes on MicroRemoteClientInvoker.clientLeaseLock + // + // By synchronizing on connectionValidatorLock here, we assure that all sequences acquire + // Client.connectionValidatorLock first and then acquire MicroRemoteClientInvoker.clientLeaseLock. + // + // See JBREM-1242 and JBREM-1297. + synchronized (Client.getConnectionValidatorLock()) + { + sharedInvoker.terminateLease(null, disconnectTimeout, leasePinger); + } } else {

13 years, 1 month

1
0
0 / 0

JBoss Remoting SVN: r6420 - in remoting2/branches/2.5.4.SP2_JBREM-1297: src/main/org/jboss/remoting and 9 other directories.

by jboss-remoting-commits＠lists.jboss.org

Author: raggz Date: 2011-11-30 15:52:18 -0500 (Wed, 30 Nov 2011) New Revision: 6420 Modified: remoting2/branches/2.5.4.SP2_JBREM-1297/ remoting2/branches/2.5.4.SP2_JBREM-1297/src/main/org/jboss/remoting/Client.java remoting2/branches/2.5.4.SP2_JBREM-1297/src/tests/org/jboss/test/remoting/transport/http/marshal/HttpContentTypeTestCase.java remoting2/branches/2.5.4.SP2_JBREM-1297/src/tests/org/jboss/test/remoting/transport/servlet/mbeanserver/jboss/MBeanServerJBossTestClient.java remoting2/branches/2.5.4.SP2_JBREM-1297/src/tests/org/jboss/test/remoting/transport/servlet/mbeanserver/platform/MBeanServerPlatformTestClient.java remoting2/branches/2.5.4.SP2_JBREM-1297/src/tests/org/jboss/test/remoting/transport/servlet/multihome/remoting-servlet-service.xml remoting2/branches/2.5.4.SP2_JBREM-1297/src/tests/org/jboss/test/remoting/transport/servlet/nopreservelines/remoting-servlet-service.xml remoting2/branches/2.5.4.SP2_JBREM-1297/src/tests/org/jboss/test/remoting/transport/servlet/preservelines/remoting-servlet-service.xml remoting2/branches/2.5.4.SP2_JBREM-1297/src/tests/org/jboss/test/remoting/transport/servlet/remoting-servlet-service.xml remoting2/branches/2.5.4.SP2_JBREM-1297/src/tests/org/jboss/test/remoting/transport/servlet/ssl/keystore remoting2/branches/2.5.4.SP2_JBREM-1297/src/tests/org/jboss/test/remoting/transport/servlet/ssl/remoting-servlet-service.xml remoting2/branches/2.5.4.SP2_JBREM-1297/src/tests/org/jboss/test/remoting/transport/servlet/ssl/truststore remoting2/branches/2.5.4.SP2_JBREM-1297/src/tests/org/jboss/test/remoting/transport/socket/ssl/timeout/SSLSocketWriteTimeoutTestCase.java Log: JBPAPP-7631; Back port of JBREM-1297 - part1 Property changes on: remoting2/branches/2.5.4.SP2_JBREM-1297 ___________________________________________________________________ Added: svn:mergeinfo + /remoting2/branches/2.x:6401 Modified: remoting2/branches/2.5.4.SP2_JBREM-1297/src/main/org/jboss/remoting/Client.java =================================================================== --- remoting2/branches/2.5.4.SP2_JBREM-1297/src/main/org/jboss/remoting/Client.java 2011-11-30 20:06:10 UTC (rev 6419) +++ remoting2/branches/2.5.4.SP2_JBREM-1297/src/main/org/jboss/remoting/Client.java 2011-11-30 20:52:18 UTC (rev 6420) @@ -1904,6 +1904,12 @@ } } + + static Object getConnectionValidatorLock() + { + return connectionValidatorLock; + } + // Protected ------------------------------------------------------------------------------------ // Private -------------------------------------------------------------------------------------- @@ -2040,17 +2046,25 @@ // // 1. a. This method calls MicroRemoteClientInvoker.establishLease() // b. MicroRemoteClientInvoker.establishLease() synchronizes on MicroRemoteClientInvoker.clientLeaseLock - // and calls Client.addConnectionListener() - // c. Client.addConnectionListener() synchronizes on Client.connectionValidatorLock + // c. MicroRemoteClientInvoker.establishLease() calls Client.addConnectionListener() + // d. Client.addConnectionListener() synchronizes on Client.connectionValidatorLock // - // 2. a. Client.addConnectionListener() synchronizes on Client.connectionValidatorLock and calls - // new ConnectionValidator() - // b. new ConnectionValidator() calls MicroRemoteClientInvoker.getLeasePinger(), which - // synchronizes on MicroRemoteClientInvoker.clientLeaseLock + // 2. a. Client.addConnectionListener() synchronizes on Client.connectionValidatorLock + // b. Client.addConnectionListener() calls new ConnectionValidator() + // c. new ConnectionValidator() calls MicroRemoteClientInvoker.getLeasePinger() + // d. MicroRemoteClientInvoker.getLeasePinger() synchronizes on MicroRemoteClientInvoker.clientLeaseLock // - // By synchronizing on connectionValidatorLock here, we assure that both sequences acquire + // 3. a. ConnectionValidator$WaitOnConnectionCheckTimerTask.run() synchronizes on Client.connectionValidatorLock + // b. ConnectionValidator$WaitOnConnectionCheckTimerTask.run() calls MicroRemoteClientInvoker.terminateLease() + // c. MicroRemoteClientInvoker.terminateLease() synchronizes on MicroRemoteClientInvoker.clientLeaseLock + // d. MicroRemoteClientInvoker.terminateLease() calls LeasePinger.stopPing() + // e. LeasePinger.stopPing() calls Client.notifyListeners() + // f. Client.notifyListeners() synchronizes on Client.connectionValidatorLock + // + // By synchronizing on connectionValidatorLock here, we assure that all sequences acquire // Client.connectionValidatorLock first and then acquire MicroRemoteClientInvoker.clientLeaseLock. // + // See JBREM-1242 and JBREM-1297. synchronized(connectionValidatorLock) { invoker.establishLease(sessionId, temp, leasePeriod); Property changes on: remoting2/branches/2.5.4.SP2_JBREM-1297/src/tests/org/jboss/test/remoting/transport/http/marshal/HttpContentTypeTestCase.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: remoting2/branches/2.5.4.SP2_JBREM-1297/src/tests/org/jboss/test/remoting/transport/servlet/mbeanserver/jboss/MBeanServerJBossTestClient.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: remoting2/branches/2.5.4.SP2_JBREM-1297/src/tests/org/jboss/test/remoting/transport/servlet/mbeanserver/platform/MBeanServerPlatformTestClient.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: remoting2/branches/2.5.4.SP2_JBREM-1297/src/tests/org/jboss/test/remoting/transport/servlet/multihome/remoting-servlet-service.xml ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: remoting2/branches/2.5.4.SP2_JBREM-1297/src/tests/org/jboss/test/remoting/transport/servlet/nopreservelines/remoting-servlet-service.xml ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: remoting2/branches/2.5.4.SP2_JBREM-1297/src/tests/org/jboss/test/remoting/transport/servlet/preservelines/remoting-servlet-service.xml ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: remoting2/branches/2.5.4.SP2_JBREM-1297/src/tests/org/jboss/test/remoting/transport/servlet/remoting-servlet-service.xml ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: remoting2/branches/2.5.4.SP2_JBREM-1297/src/tests/org/jboss/test/remoting/transport/servlet/ssl/keystore ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: remoting2/branches/2.5.4.SP2_JBREM-1297/src/tests/org/jboss/test/remoting/transport/servlet/ssl/remoting-servlet-service.xml ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: remoting2/branches/2.5.4.SP2_JBREM-1297/src/tests/org/jboss/test/remoting/transport/servlet/ssl/truststore ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: remoting2/branches/2.5.4.SP2_JBREM-1297/src/tests/org/jboss/test/remoting/transport/socket/ssl/timeout/SSLSocketWriteTimeoutTestCase.java ___________________________________________________________________ Deleted: svn:mergeinfo -

13 years, 1 month

1
0
0 / 0

JBoss Remoting SVN: r6419 - remoting2/branches.

by jboss-remoting-commits＠lists.jboss.org

Author: raggz Date: 2011-11-30 15:06:10 -0500 (Wed, 30 Nov 2011) New Revision: 6419 Added: remoting2/branches/2.5.4.SP2_JBREM-1297/ Log: Back port of JBREM-1297; JBPAPP-7631.

13 years, 1 month

1
0
0 / 0

JBoss Remoting SVN: r6418 - remoting2/branches/2.x/src/etc.

by jboss-remoting-commits＠lists.jboss.org

Author: ron.sigal(a)jboss.com Date: 2011-11-30 13:59:39 -0500 (Wed, 30 Nov 2011) New Revision: 6418 Added: remoting2/branches/2.x/src/etc/jenkins.touch Log: JBREM-1297: Adding new file to be used for starting a jenkins run. Added: remoting2/branches/2.x/src/etc/jenkins.touch ===================================================================

13 years, 1 month

1
0
0 / 0

JBoss Remoting SVN: r6417 - remoting2/branches/2.2/src/etc.

by jboss-remoting-commits＠lists.jboss.org

Author: ron.sigal(a)jboss.com Date: 2011-11-30 13:59:06 -0500 (Wed, 30 Nov 2011) New Revision: 6417 Added: remoting2/branches/2.2/src/etc/jenkins.touch Log: JBREM-1297: Adding new file to be used for starting a jenkins run. Added: remoting2/branches/2.2/src/etc/jenkins.touch ===================================================================

13 years, 1 month

1
0
0 / 0

JBoss Remoting SVN: r6416 - remoting2/branches.

by jboss-remoting-commits＠lists.jboss.org

Author: jbertram(a)redhat.com Date: 2011-11-28 13:36:33 -0500 (Mon, 28 Nov 2011) New Revision: 6416 Added: remoting2/branches/2.2.4_JBREM-1297/ Log: JBPAPP-7605

13 years, 1 month

1
0
0 / 0

JBoss Remoting SVN: r6415 - remoting2/branches.

by jboss-remoting-commits＠lists.jboss.org

Author: jbertram(a)redhat.com Date: 2011-11-28 13:36:10 -0500 (Mon, 28 Nov 2011) New Revision: 6415 Removed: remoting2/branches/2.2.3-SP3_JBREM-1297/ Log: JBPAPP-7605

13 years, 1 month

1
0
0 / 0

JBoss Remoting SVN: r6414 - remoting2/branches.

by jboss-remoting-commits＠lists.jboss.org

Author: jbertram(a)redhat.com Date: 2011-11-28 13:30:59 -0500 (Mon, 28 Nov 2011) New Revision: 6414 Added: remoting2/branches/2.2.3-SP3_JBREM-1297/ Log: JBPAPP-7605

13 years, 1 month

1
0
0 / 0

JBoss Remoting SVN: r6413 - remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/http/marshal.

by jboss-remoting-commits＠lists.jboss.org

Author: ron.sigal(a)jboss.com Date: 2011-11-22 12:56:47 -0500 (Tue, 22 Nov 2011) New Revision: 6413 Modified: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/http/marshal/ContentTypePrefixTestCase.java Log: JBREM-1301: Added some upper case characters to content-type. Modified: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/http/marshal/ContentTypePrefixTestCase.java =================================================================== --- remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/http/marshal/ContentTypePrefixTestCase.java 2011-11-22 17:55:58 UTC (rev 6412) +++ remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/http/marshal/ContentTypePrefixTestCase.java 2011-11-22 17:56:47 UTC (rev 6413) @@ -155,7 +155,8 @@ public void addListener(InvokerCallbackHandler callbackHandler) {} public Object invoke(final InvocationRequest invocation) throws Throwable { - invocation.getReturnPayload().put("Content-Type", "application/octet-stream?charSet=UTF-8"); + // Adding some upper case characters for test. + invocation.getReturnPayload().put("Content-Type", "Application/Octet-stream?charSet=UTF-8"); return invocation.getParameter(); } public void removeListener(InvokerCallbackHandler callbackHandler) {}

13 years, 1 month

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

jboss-remoting-commits November 2011