Author: ron.sigal(a)jboss.com Date: 2008-03-18 23:13:04 -0400 (Tue, 18 Mar 2008) New Revision: 3663 Modified: remoting2/branches/2.x/src/main/org/jboss/remoting/transport/rmi/RMIServerInvoker.java Log: JBREM-933: Tests if client socket factory is null before clearing it. 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-19 03:04:07 UTC (rev 3662) +++ remoting2/branches/2.x/src/main/org/jboss/remoting/transport/rmi/RMIServerInvoker.java 2008-03-19 03:13:04 UTC (rev 3663) @@ -314,7 +314,8 @@ } - csf.clear(); + if (csf != null) + csf.clear(); if (isPrimaryServer) {