Author: ron.sigal(a)jboss.com Date: 2008-03-17 03:36:12 -0400 (Mon, 17 Mar 2008) New Revision: 3655 Modified: remoting2/branches/2.x/src/main/org/jboss/remoting/transport/rmi/RMIServerInvoker.java Log: JBREM-933: Clears client socket factory when it shuts down. Modified: remoting2/branches/2.x/src/main/org/jboss/remoting/transport/rmi/RMIServerInvoker.java =================================================================== --- remoting2/branches/2.x/src/main/org/jboss/remoting/transport/rmi/RMIServerInvoker.java 2008-03-17 07:35:18 UTC (rev 3654) +++ remoting2/branches/2.x/src/main/org/jboss/remoting/transport/rmi/RMIServerInvoker.java 2008-03-17 07:36:12 UTC (rev 3655) @@ -86,6 +86,7 @@ protected boolean rmiOnewayMarshalling; private Remote stub; + private RemotingRMIClientSocketFactory csf; /** @@ -190,7 +191,7 @@ locator.setHomeInUse(bindHome); RMIServerSocketFactory ssf = new RemotingRMIServerSocketFactory(getServerSocketFactory(), BACKLOG_DEFAULT, bindHost, getTimeout()); - RMIClientSocketFactory csf = getRMIClientSocketFactory(clientConnectHost); + csf = getRMIClientSocketFactory(clientConnectHost); stub = UnicastRemoteObject.exportObject(this, bindPort, csf, ssf); log.debug("Binding server to \"remoting/RMIServerInvoker/" + bindPort + "\" in registry"); @@ -201,7 +202,7 @@ } - protected RMIClientSocketFactory getRMIClientSocketFactory(String clientConnectHost) + protected RemotingRMIClientSocketFactory getRMIClientSocketFactory(String clientConnectHost) { // Remove server side socket creation listeners. HashMap remoteConfig = new HashMap(configuration); @@ -313,6 +314,8 @@ } + csf.clear(); + if (isPrimaryServer) { Iterator it = secondaryServers.iterator();