Index: java/org/apache/catalina/mbeans/JmxRemoteLifecycleListener.java
===================================================================
--- java/org/apache/catalina/mbeans/JmxRemoteLifecycleListener.java	(revision 1559823)
+++ java/org/apache/catalina/mbeans/JmxRemoteLifecycleListener.java	(working copy)
@@ -240,6 +240,7 @@
             if (csf != null) {
                 env.put(RMIConnectorServer.RMI_CLIENT_SOCKET_FACTORY_ATTRIBUTE,
                         csf);
+                env.put("com.sun.jndi.rmi.factory.socket", csf);
             }
             if (ssf != null) {
                 env.put(RMIConnectorServer.RMI_SERVER_SOCKET_FACTORY_ATTRIBUTE,