jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ju...@apache.org
Subject svn commit: r529491 - /jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/ServerAdapterFactory.java
Date Tue, 17 Apr 2007 05:44:17 GMT
Author: jukka
Date: Mon Apr 16 22:44:15 2007
New Revision: 529491

URL: http://svn.apache.org/viewvc?view=rev&rev=529491
Log:
JCR-781: Use null as the default socket factories. (This might cause trouble...)

Modified:
    jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/ServerAdapterFactory.java

Modified: jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/ServerAdapterFactory.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/ServerAdapterFactory.java?view=diff&rev=529491&r1=529490&r2=529491
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/ServerAdapterFactory.java
(original)
+++ jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/ServerAdapterFactory.java
Mon Apr 16 22:44:15 2007
@@ -19,7 +19,6 @@
 import java.rmi.RemoteException;
 import java.rmi.server.RMIClientSocketFactory;
 import java.rmi.server.RMIServerSocketFactory;
-import java.rmi.server.RMISocketFactory;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -155,14 +154,7 @@
      * @since 1.3
      */
     public RMIClientSocketFactory getClientSocketFactory() {
-        RMIClientSocketFactory factory = clientSocketFactory;
-        if (factory == null) {
-            factory = RMISocketFactory.getSocketFactory();
-        }
-        if (factory == null) {
-            factory = RMISocketFactory.getDefaultSocketFactory();
-        }
-        return factory;
+        return clientSocketFactory;
     }
 
     /**
@@ -183,14 +175,7 @@
      * @since 1.3
      */
     public RMIServerSocketFactory getServerSocketFactory() {
-        RMIServerSocketFactory factory = serverSocketFactory;
-        if (factory == null) {
-            factory = RMISocketFactory.getSocketFactory();
-        }
-        if (factory == null) {
-            factory = RMISocketFactory.getDefaultSocketFactory();
-        }
-        return factory;
+        return serverSocketFactory;
     }
 
     /**



Mime
View raw message