1 files changed, 88 insertions, 8 deletions

diff --git a/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpNode.java b/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpNode.java
index d5edd135cf..7512d34c21 100644
--- a/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpNode.java
+++ b/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpNode.java
@@ -20,8 +20,6 @@ package com.ericsson.otp.erlang;
 
 import java.io.IOException;
 import java.lang.ref.WeakReference;
-import java.net.ServerSocket;
-import java.net.Socket;
 import java.util.Collection;
 import java.util.Enumeration;
 import java.util.Hashtable;
@@ -97,7 +95,39 @@ public class OtpNode extends OtpLocalNode {
      *
      */
     public OtpNode(final String node) throws IOException {
-        this(node, defaultCookie, 0);
+        super(node);
+
+        init(0);
+    }
+
+    /**
+     * <p>
+     * Create a node using the default cookie. The default cookie is found by
+     * reading the first line of the .erlang.cookie file in the user's home
+     * directory. The home directory is obtained from the System property
+     * "user.home".
+     * </p>
+     *
+     * <p>
+     * If the file does not exist, an empty string is used. This method makes no
+     * attempt to create the file.
+     * </p>
+     *
+     * @param node
+     *            the name of this node.
+     *
+     * @param transportFactory
+     *            the transport factory to use when creating connections.
+     *
+     * @exception IOException
+     *                if communication could not be initialized.
+     *
+     */
+    public OtpNode(final String node,
+            final OtpTransportFactory transportFactory) throws IOException {
+        super(node, transportFactory);
+
+        init(0);
     }
 
     /**
@@ -128,6 +158,28 @@ public class OtpNode extends OtpLocalNode {
      *            the authorization cookie that will be used by this node when
      *            it communicates with other nodes.
      *
+     * @param transportFactory
+     *            the transport factory to use when creating connections.
+     *
+     * @exception IOException
+     *                if communication could not be initialized.
+     *
+     */
+    public OtpNode(final String node, final String cookie,
+            final OtpTransportFactory transportFactory) throws IOException {
+        this(node, cookie, 0, transportFactory);
+    }
+
+    /**
+     * Create a node.
+     *
+     * @param node
+     *            the name of this node.
+     *
+     * @param cookie
+     *            the authorization cookie that will be used by this node when
+     *            it communicates with other nodes.
+     *
      * @param port
      *            the port number you wish to use for incoming connections.
      *            Specifying 0 lets the system choose an available port.
@@ -143,6 +195,34 @@ public class OtpNode extends OtpLocalNode {
         init(port);
     }
 
+    /**
+     * Create a node.
+     *
+     * @param node
+     *            the name of this node.
+     *
+     * @param cookie
+     *            the authorization cookie that will be used by this node when
+     *            it communicates with other nodes.
+     *
+     * @param port
+     *            the port number you wish to use for incoming connections.
+     *            Specifying 0 lets the system choose an available port.
+     *
+     * @param transportFactory
+     *            the transport factory to use when creating connections.
+     *
+     * @exception IOException
+     *                if communication could not be initialized.
+     *
+     */
+    public OtpNode(final String node, final String cookie, final int port,
+            final OtpTransportFactory transportFactory) throws IOException {
+        super(node, cookie, transportFactory);
+
+        init(port);
+    }
+
     private synchronized void init(final int aport) throws IOException {
         if (!initDone) {
             connections = new Hashtable<String, OtpCookedConnection>(17,
@@ -681,12 +761,12 @@ public class OtpNode extends OtpLocalNode {
      * this thread simply listens for incoming connections
      */
     public class Acceptor extends Thread {
-        private final ServerSocket sock;
+        private final OtpServerTransport sock;
         private final int acceptorPort;
         private volatile boolean done = false;
 
         Acceptor(final int port) throws IOException {
-            sock = new ServerSocket(port);
+            sock = createServerTransport(port);
             acceptorPort = sock.getLocalPort();
             OtpNode.this.port = acceptorPort;
 
@@ -720,7 +800,7 @@ public class OtpNode extends OtpLocalNode {
             localStatus(node, false, null);
         }
 
-        private void closeSock(final ServerSocket s) {
+        private void closeSock(final OtpServerTransport s) {
             try {
                 if (s != null) {
                     s.close();
@@ -729,7 +809,7 @@ public class OtpNode extends OtpLocalNode {
             }
         }
 
-        private void closeSock(final Socket s) {
+        private void closeSock(final OtpTransport s) {
             try {
                 if (s != null) {
                     s.close();
@@ -744,7 +824,7 @@ public class OtpNode extends OtpLocalNode {
 
         @Override
         public void run() {
-            Socket newsock = null;
+            OtpTransport newsock = null;
             OtpCookedConnection conn = null;
 
             localStatus(node, true, null);