Author: ron.sigal(a)jboss.com Date: 2009-02-16 19:53:11 -0500 (Mon, 16 Feb 2009) New Revision: 4851 Modified: remoting2/branches/2.2/src/main/org/jboss/remoting/ServerInvoker.java Log: JBREM-1081: In getCallbackHandler() moved callbackHandler.connect() inside synchronized block. Modified: remoting2/branches/2.2/src/main/org/jboss/remoting/ServerInvoker.java =================================================================== --- remoting2/branches/2.2/src/main/org/jboss/remoting/ServerInvoker.java 2009-02-17 00:50:05 UTC (rev 4850) +++ remoting2/branches/2.2/src/main/org/jboss/remoting/ServerInvoker.java 2009-02-17 00:53:11 UTC (rev 4851) @@ -1857,11 +1857,11 @@ { callbackHandler = new ServerInvokerCallbackHandler(invocation, getLocator(), this); callbackHandlers.put(id, callbackHandler); + callbackHandler.connect(); + if(trace) { log.trace("ServerInvoker (" + this + ") adding server callback handler " + callbackHandler + " with id of " + id + "."); } } } - callbackHandler.connect(); - if(trace) { log.trace("ServerInvoker (" + this + ") adding server callback handler " + callbackHandler + " with id of " + id + "."); } return callbackHandler; }