Bug 1658 - minor refactoring

1 files changed, 10 insertions, 16 deletions

diff --git a/java/src/IceInternal/TcpEndpointI.java b/java/src/IceInternal/TcpEndpointI.java
index ecdbd544d28..5ec1cba6a60 100644
--- a/java/src/IceInternal/TcpEndpointI.java
+++ b/java/src/IceInternal/TcpEndpointI.java
@@ -14,7 +14,7 @@ final class TcpEndpointI extends EndpointI
     final static short TYPE = 1;
 
     public
-    TcpEndpointI(Instance instance, String ho, int po, int ti, String conId, boolean co, boolean oae)
+    TcpEndpointI(Instance instance, String ho, int po, int ti, String conId, boolean co)
     {
         _instance = instance;
         _host = ho;
@@ -22,19 +22,17 @@ final class TcpEndpointI extends EndpointI
         _timeout = ti;
         _connectionId = conId;
         _compress = co;
-        _oaEndpoint = oae;
         calcHashValue();
     }
 
     public
-    TcpEndpointI(Instance instance, String str, boolean oaEndpoint)
+    TcpEndpointI(Instance instance, String str, boolean server)
     {
         _instance = instance;
         _host = null;
         _port = 0;
         _timeout = -1;
         _compress = false;
-        _oaEndpoint = oaEndpoint;
 
         String[] arr = str.split("[ \t\n\r]+");
 
@@ -138,7 +136,7 @@ final class TcpEndpointI extends EndpointI
             _host = _instance.defaultsAndOverrides().defaultHost;
             if(_host == null)
             {
-                if(_oaEndpoint)
+                if(server)
                 {
                     _host = "0.0.0.0";
                 }
@@ -165,7 +163,6 @@ final class TcpEndpointI extends EndpointI
         _timeout = s.readInt();
         _compress = s.readBool();
         s.endReadEncaps();
-        _oaEndpoint = false;
         calcHashValue();
     }
 
@@ -242,7 +239,7 @@ final class TcpEndpointI extends EndpointI
         }
         else
         {
-            return new TcpEndpointI(_instance, _host, _port, timeout, _connectionId, _compress, _oaEndpoint);
+            return new TcpEndpointI(_instance, _host, _port, timeout, _connectionId, _compress);
         }
     }
 
@@ -258,7 +255,7 @@ final class TcpEndpointI extends EndpointI
         }
         else
         {
-            return new TcpEndpointI(_instance, _host, _port, _timeout, connectionId, _compress, _oaEndpoint);
+            return new TcpEndpointI(_instance, _host, _port, _timeout, connectionId, _compress);
         }
     }
 
@@ -286,7 +283,7 @@ final class TcpEndpointI extends EndpointI
         }
         else
         {
-            return new TcpEndpointI(_instance, _host, _port, _timeout, _connectionId, compress, _oaEndpoint);
+            return new TcpEndpointI(_instance, _host, _port, _timeout, _connectionId, compress);
         }
     }
 
@@ -359,8 +356,7 @@ final class TcpEndpointI extends EndpointI
     acceptor(EndpointIHolder endpoint, String adapterName)
     {
         TcpAcceptor p = new TcpAcceptor(_instance, _host, _port);
-        endpoint.value = new TcpEndpointI(_instance, _host, p.effectivePort(), _timeout, _connectionId,
-                                          _compress, _oaEndpoint);
+        endpoint.value = new TcpEndpointI(_instance, _host, p.effectivePort(), _timeout, _connectionId, _compress);
         return p;
     }
 
@@ -369,7 +365,7 @@ final class TcpEndpointI extends EndpointI
     // host if endpoint was configured with no host set. 
     //
     public java.util.ArrayList
-    expand()
+    expand(boolean includeLoopback)
     {
         java.util.ArrayList endps = new java.util.ArrayList();
         if(_host.equals("0.0.0.0"))
@@ -379,10 +375,9 @@ final class TcpEndpointI extends EndpointI
             while(iter.hasNext())
             {
                 String host = (String)iter.next();
-                if(!_oaEndpoint || hosts.size() == 1 || !host.equals("127.0.0.1"))
+                if(includeLoopback || hosts.size() == 1 || !host.equals("127.0.0.1"))
                 {
-                    endps.add(new TcpEndpointI(_instance, host, _port, _timeout, _connectionId, _compress,
-                                               _oaEndpoint));
+                    endps.add(new TcpEndpointI(_instance, host, _port, _timeout, _connectionId, _compress));
                 }
             }
         }
@@ -525,6 +520,5 @@ final class TcpEndpointI extends EndpointI
     private int _timeout;
     private String _connectionId = "";
     private boolean _compress;
-    private boolean _oaEndpoint;
     private int _hashCode;
 }