Author: ron.sigal(a)jboss.com
Date: 2011-05-25 12:01:03 -0400 (Wed, 25 May 2011)
New Revision: 6374
Modified:
remoting2/branches/2.x/src/main/org/jboss/remoting/ServerInvoker.java
Log:
JBREM-1292: Made callbackHandlers a ConcurrentHashMap.
Modified: remoting2/branches/2.x/src/main/org/jboss/remoting/ServerInvoker.java
===================================================================
--- remoting2/branches/2.x/src/main/org/jboss/remoting/ServerInvoker.java 2011-05-25
15:59:36 UTC (rev 6373)
+++ remoting2/branches/2.x/src/main/org/jboss/remoting/ServerInvoker.java 2011-05-25
16:01:03 UTC (rev 6374)
@@ -304,7 +304,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();
@@ -2194,7 +2194,7 @@
{
ServerInvokerCallbackHandler callbackHandler = null;
String id = ServerInvokerCallbackHandler.getId(invocation);
- synchronized(callbackHandlers)
+// synchronized(callbackHandlers)
{
callbackHandler = (ServerInvokerCallbackHandler)callbackHandlers.get(id);
@@ -2216,7 +2216,7 @@
String id = ServerInvokerCallbackHandler.getId(invocation);
ServerInvokerCallbackHandler callbackHandler = null;
- synchronized(callbackHandlers)
+// synchronized(callbackHandlers)
{
callbackHandler = (ServerInvokerCallbackHandler) callbackHandlers.remove(id);
}