4:45 p.m.
Author: jbertram(a)redhat.com
Date: 2011-05-16 16:45:52 -0400 (Mon, 16 May 2011)
New Revision: 6372
Modified:
remoting2/branches/2.2.3-SP1_JBREM-1269_JBREM-1275_JBREM-1261_JBREM-1277_JBREM-1280_JBREM-1281_JBREM-1292/
remoting2/branches/2.2.3-SP1_JBREM-1269_JBREM-1275_JBREM-1261_JBREM-1277_JBREM-1280_JBREM-1281_JBREM-1292/src/main/org/jboss/remoting/ServerInvoker.java
remoting2/branches/2.2.3-SP1_JBREM-1269_JBREM-1275_JBREM-1261_JBREM-1277_JBREM-1280_JBREM-1281_JBREM-1292/src/main/org/jboss/remoting/transport/bisocket/
remoting2/branches/2.2.3-SP1_JBREM-1269_JBREM-1275_JBREM-1261_JBREM-1277_JBREM-1280_JBREM-1281_JBREM-1292/src/tests/org/jboss/test/remoting/transport/bisocket/dos/
Log:
JBPAPP-6536
Property changes on:
remoting2/branches/2.2.3-SP1_JBREM-1269_JBREM-1275_JBREM-1261_JBREM-1277_JBREM-1280_JBREM-1281_JBREM-1292
___________________________________________________________________
Modified: svn:mergeinfo
-
/remoting2/branches/2.2:6177-6178,6226,6253,6261-6263,6266-6267,6271-6273,6281-6284,6291-6292,6297,6313-6320,6322-6324
+
/remoting2/branches/2.2:6177-6178,6226,6253,6261-6263,6266-6267,6271-6273,6281-6284,6291-6292,6297,6313-6320,6322-6324
/remoting2/branches/2.2.3-SP2_JBREM-1269_JBREM-1275_JBREM-1261_JBREM-1277_JBREM-1280_JBREM-1281_JBREM-1292:6370
Modified:
remoting2/branches/2.2.3-SP1_JBREM-1269_JBREM-1275_JBREM-1261_JBREM-1277_JBREM-1280_JBREM-1281_JBREM-1292/src/main/org/jboss/remoting/ServerInvoker.java
===================================================================
---
remoting2/branches/2.2.3-SP1_JBREM-1269_JBREM-1275_JBREM-1261_JBREM-1277_JBREM-1280_JBREM-1281_JBREM-1292/src/main/org/jboss/remoting/ServerInvoker.java 2011-05-16
20:38:44 UTC (rev 6371)
+++
remoting2/branches/2.2.3-SP1_JBREM-1269_JBREM-1275_JBREM-1261_JBREM-1277_JBREM-1280_JBREM-1281_JBREM-1292/src/main/org/jboss/remoting/ServerInvoker.java 2011-05-16
20:45:52 UTC (rev 6372)
@@ -255,7 +255,7 @@
// to avoid lookup in this common case - TLF
protected volatile CallbackContainer singleCallbackContainer;
- protected Map callbackHandlers = new HashMap();
+ protected Map callbackHandlers = new ConcurrentHashMap();
protected Map clientCallbackListener = new HashMap();
protected boolean started = false;
protected ConnectionNotifier connectionNotifier = new ConnectionNotifier();
@@ -1924,7 +1924,7 @@
{
ServerInvokerCallbackHandler callbackHandler = null;
String id = ServerInvokerCallbackHandler.getId(invocation);
- synchronized(callbackHandlers)
+// synchronized(callbackHandlers)
{
callbackHandler = (ServerInvokerCallbackHandler)callbackHandlers.get(id);
@@ -1946,7 +1946,7 @@
String id = ServerInvokerCallbackHandler.getId(invocation);
ServerInvokerCallbackHandler callbackHandler = null;
- synchronized(callbackHandlers)
+// synchronized(callbackHandlers)
{
callbackHandler = (ServerInvokerCallbackHandler) callbackHandlers.remove(id);
}
Property changes on:
remoting2/branches/2.2.3-SP1_JBREM-1269_JBREM-1275_JBREM-1261_JBREM-1277_JBREM-1280_JBREM-1281_JBREM-1292/src/main/org/jboss/remoting/transport/bisocket
___________________________________________________________________
Modified: svn:mergeinfo
- /remoting2/branches/2.2/src/main/org/jboss/remoting/transport/bisocket:6272-6273
+ /remoting2/branches/2.2/src/main/org/jboss/remoting/transport/bisocket:6272-6273
/remoting2/branches/2.2.3-SP2_JBREM-1269_JBREM-1275_JBREM-1261_JBREM-1277_JBREM-1280_JBREM-1281_JBREM-1292/src/main/org/jboss/remoting/transport/bisocket:6370
Property changes on:
remoting2/branches/2.2.3-SP1_JBREM-1269_JBREM-1275_JBREM-1261_JBREM-1277_JBREM-1280_JBREM-1281_JBREM-1292/src/tests/org/jboss/test/remoting/transport/bisocket/dos
___________________________________________________________________
Modified: svn:mergeinfo
-
/remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/bisocket/dos:6271
+
/remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/bisocket/dos:6271
/remoting2/branches/2.2.3-SP2_JBREM-1269_JBREM-1275_JBREM-1261_JBREM-1277_JBREM-1280_JBREM-1281_JBREM-1292/src/tests/org/jboss/test/remoting/transport/bisocket/dos:6370