You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by ju...@apache.org on 2007/04/18 10:02:04 UTC
svn commit: r529906 - in
/jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server:
RemoteAdapterFactory.java ServerAdapterFactory.java ServerObject.java
Author: jukka
Date: Wed Apr 18 01:01:59 2007
New Revision: 529906
URL: http://svn.apache.org/viewvc?view=rev&rev=529906
Log:
JCR-781: Reverted revision 526707 as I'm not confident enough that the default behaviour avoids NPEs in all environments. Let's try an alternative solution...
Modified:
jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/RemoteAdapterFactory.java
jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/ServerAdapterFactory.java
jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/ServerObject.java
Modified: jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/RemoteAdapterFactory.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/RemoteAdapterFactory.java?view=diff&rev=529906&r1=529905&r2=529906
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/RemoteAdapterFactory.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/RemoteAdapterFactory.java Wed Apr 18 01:01:59 2007
@@ -91,30 +91,6 @@
public interface RemoteAdapterFactory {
/**
- * Returns the RMI port to use.
- *
- * @return RMI port number
- * @since 1.3
- */
- int getPort();
-
- /**
- * Returns the RMI client socket factory to use.
- *
- * @return RMI client socket factory
- * @since 1.3
- */
- RMIClientSocketFactory getClientSocketFactory();
-
- /**
- * Returns the RMI server socket factory to use.
- *
- * @return RMI server socket factory
- * @since 1.3
- */
- RMIServerSocketFactory getServerSocketFactory();
-
- /**
* Returns a remote adapter for the given local repository.
*
* @param repository local repository
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=529906&r1=529905&r2=529906
==============================================================================
--- 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 Wed Apr 18 01:01:59 2007
@@ -103,12 +103,6 @@
/** The buffer size of iterators created by this factory. */
private int bufferSize = DEFAULT_BUFFER_SIZE;
- private int port = 0;
-
- private RMIClientSocketFactory clientSocketFactory = null;
-
- private RMIServerSocketFactory serverSocketFactory = null;
-
/**
* Returns the iterator buffer size.
*
@@ -125,68 +119,6 @@
*/
public void setBufferSize(int bufferSize) {
this.bufferSize = bufferSize;
- }
-
- /**
- * Returns the RMI port to use.
- *
- * @return RMI port number
- * @since 1.3
- */
- public int getPort() {
- return port;
- }
-
- /**
- * Sets the RMI port to use.
- *
- * @param port RMI port number
- * @since 1.3
- */
- public void setPort(int port) {
- this.port = port;
- }
-
- /**
- * Returns the RMI client socket factory to use.
- *
- * @return RMI client socket factory
- * @since 1.3
- */
- public RMIClientSocketFactory getClientSocketFactory() {
- return clientSocketFactory;
- }
-
- /**
- * Sets the RMI client socket factory to use.
- *
- * @param factory RMI client socket factory,
- * or <code>null</code> to use the default
- * @since 1.3
- */
- public void setClientSocketFactory(RMIClientSocketFactory factory) {
- clientSocketFactory = factory;
- }
-
- /**
- * Returns the RMI server socket factory to use.
- *
- * @return RMI server socket factory
- * @since 1.3
- */
- public RMIServerSocketFactory getServerSocketFactory() {
- return serverSocketFactory;
- }
-
- /**
- * Sets the RMI server socket factory to use.
- *
- * @param factory RMI server socket factory,
- * or <code>null</code> to use the default
- * @since 1.3
- */
- public void setServerSocketFactory(RMIServerSocketFactory factory) {
- serverSocketFactory = factory;
}
/**
Modified: jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/ServerObject.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/ServerObject.java?view=diff&rev=529906&r1=529905&r2=529906
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/ServerObject.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/ServerObject.java Wed Apr 18 01:01:59 2007
@@ -68,9 +68,6 @@
*/
protected ServerObject(RemoteAdapterFactory factory)
throws RemoteException {
- super(factory.getPort(),
- factory.getClientSocketFactory(),
- factory.getServerSocketFactory());
this.factory = factory;
}