Author: ron.sigal(a)jboss.com Date: 2011-05-16 15:57:14 -0400 (Mon, 16 May 2011) New Revision: 6370 Modified: 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/ServerInvoker.java Log: JBREM-1292: Changed callbackHandlers to a ConcurrentHashMap. Modified: 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/ServerInvoker.java =================================================================== --- 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/ServerInvoker.java 2011-05-16 19:49:35 UTC (rev 6369) +++ 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/ServerInvoker.java 2011-05-16 19:57:14 UTC (rev 6370) @@ -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); }