1 files changed, 15 insertions, 24 deletions

diff --git a/java/src/IceInternal/TcpConnector.java b/java/src/IceInternal/TcpConnector.java
index e4289f27a17..4e1ff9ff5e1 100644
--- a/java/src/IceInternal/TcpConnector.java
+++ b/java/src/IceInternal/TcpConnector.java
@@ -11,49 +11,45 @@ package IceInternal;
 
 final class TcpConnector implements Connector
 {
-    public Transceiver
-    connect()
+    public Transceiver connect()
     {
-        if(_traceLevels.network >= 2)
+        if(_instance.traceLevel() >= 2)
         {
-            String s = "trying to establish tcp connection to " + toString();
-            _logger.trace(_traceLevels.networkCat, s);
+            String s = "trying to establish " + _instance.protocol() + " connection to " + toString();
+            _instance.logger().trace(_instance.traceCategory(), s);
         }
 
         try
         {
             java.nio.channels.SocketChannel fd = Network.createTcpSocket();
             Network.setBlock(fd, false);
-            Network.setTcpBufSize(fd, _instance.initializationData().properties, _logger);
+            Network.setTcpBufSize(fd, _instance.properties(), _instance.logger());
             final java.net.InetSocketAddress addr = _proxy != null ? _proxy.getAddress() : _addr;
             Network.doConnect(fd, addr);
             return new TcpTransceiver(_instance, fd, _proxy, _addr);
         }
         catch(Ice.LocalException ex)
         {
-            if(_traceLevels.network >= 2)
+            if(_instance.traceLevel() >= 2)
             {
-                String s = "failed to establish tcp connection to " + toString() + "\n" + ex;
-                _logger.trace(_traceLevels.networkCat, s);
+                String s = "failed to establish " + _instance.protocol() + " connection to " + toString() + "\n" + ex;
+                _instance.logger().trace(_instance.traceCategory(), s);
             }
             throw ex;
         }
     }
 
-    public short
-    type()
+    public short type()
     {
-        return Ice.TCPEndpointType.value;
+        return _instance.type();
     }
 
-    public String
-    toString()
+    public String toString()
     {
         return Network.addrToString(_proxy == null ? _addr : _proxy.getAddress());
     }
 
-    public int
-    hashCode()
+    public int hashCode()
     {
         return _hashCode;
     }
@@ -61,12 +57,10 @@ final class TcpConnector implements Connector
     //
     // Only for use by TcpEndpoint
     //
-    TcpConnector(Instance instance, java.net.InetSocketAddress addr, NetworkProxy proxy, int timeout,
+    TcpConnector(ProtocolInstance instance, java.net.InetSocketAddress addr, NetworkProxy proxy, int timeout,
                  String connectionId)
     {
         _instance = instance;
-        _traceLevels = instance.traceLevels();
-        _logger = instance.initializationData().logger;
         _addr = addr;
         _proxy = proxy;
         _timeout = timeout;
@@ -79,8 +73,7 @@ final class TcpConnector implements Connector
         _hashCode = IceInternal.HashUtil.hashAdd(_hashCode , _connectionId);
     }
 
-    public boolean
-    equals(java.lang.Object obj)
+    public boolean equals(java.lang.Object obj)
     {
         if(!(obj instanceof TcpConnector))
         {
@@ -106,9 +99,7 @@ final class TcpConnector implements Connector
         return Network.compareAddress(_addr, p._addr) == 0;
     } 
 
-    private Instance _instance;
-    private TraceLevels _traceLevels;
-    private Ice.Logger _logger;
+    private ProtocolInstance _instance;
     private java.net.InetSocketAddress _addr;
     private NetworkProxy _proxy;
     private int _timeout;