Fix SSL accept thread (JM-522).

git-svn-id: http://svn.igniterealtime.org/svn/repos/wildfire/trunk@3330 b35dd754-fafc-0310-a699-88a17e54d16e

src/java/org/jivesoftware/wildfire/net/SSLSocketAcceptThread.java

@@ -15,6 +15,7 @@ import org.jivesoftware.wildfire.ConnectionManager;
 import org.jivesoftware.wildfire.ServerPort;
 import org.jivesoftware.util.LocaleUtils;
 import org.jivesoftware.util.Log;
+import org.jivesoftware.util.JiveGlobals;
 
 import javax.net.ssl.SSLException;
 import java.io.IOException;
@@ -34,11 +35,6 @@ public class SSLSocketAcceptThread extends Thread {
      */
     public static final int DEFAULT_PORT = 5223;
 
-    /**
-     * Interface to bind to
-     */
-    private InetAddress bindInterface;
-
     /**
      * Holds information about the port on which the server will listen for connections.
      */
@@ -78,8 +74,9 @@ public class SSLSocketAcceptThread extends Thread {
         this.connManager = connManager;
         this.serverPort = serverPort;
         int port = serverPort.getPort();
-        String interfaceName = serverPort.getInterfaceName();
-        bindInterface = null;
+        // Listen on a specific network interface if it has been set.
+        String interfaceName = JiveGlobals.getXMLProperty("network.interface");
+        InetAddress bindInterface = null;
         if (interfaceName != null) {
             try {
                 if (interfaceName.trim().length() > 0) {

src/java/org/jivesoftware/wildfire/net/SocketAcceptThread.java

@@ -67,7 +67,7 @@ public class SocketAcceptThread extends Thread {
         super("Socket Listener at port " + serverPort.getPort());
         this.connManager = connManager;
         this.serverPort = serverPort;
-        // Listen on a specific network interface if it's been set.
+        // Listen on a specific network interface if it has been set.
         String interfaceName = JiveGlobals.getXMLProperty("network.interface");
         InetAddress bindInterface = null;
         if (interfaceName != null) {