Fixed bug 2304

1 files changed, 20 insertions, 8 deletions

diff --git a/java/src/IceInternal/TcpConnector.java b/java/src/IceInternal/TcpConnector.java
index ab2a2a877e3..e42057940bb 100644
--- a/java/src/IceInternal/TcpConnector.java
+++ b/java/src/IceInternal/TcpConnector.java
@@ -20,19 +20,31 @@ final class TcpConnector implements Connector, java.lang.Comparable
             _logger.trace(_traceLevels.networkCat, s);
         }
 
-        java.nio.channels.SocketChannel fd = Network.createTcpSocket();
-        Network.setBlock(fd, false);
-        Network.setTcpBufSize(fd, _instance.initializationData().properties, _logger);
-        boolean connected = Network.doConnect(fd, _addr, timeout);
-        if(connected)
+        try
+        {
+            java.nio.channels.SocketChannel fd = Network.createTcpSocket();
+            Network.setBlock(fd, false);
+            Network.setTcpBufSize(fd, _instance.initializationData().properties, _logger);
+            boolean connected = Network.doConnect(fd, _addr, timeout);
+            if(connected)
+            {
+                if(_traceLevels.network >= 1)
+                {
+                    String s = "tcp connection established\n" + Network.fdToString(fd);
+                    _logger.trace(_traceLevels.networkCat, s);
+                }
+            }
+            return new TcpTransceiver(_instance, fd, connected);
+        }
+        catch(Ice.LocalException ex)
         {
-            if(_traceLevels.network >= 1)
+            if(_traceLevels.network >= 2)
             {
-                String s = "tcp connection established\n" + Network.fdToString(fd);
+                String s = "failed to establish tcp connection to " + toString() + "\n" + ex;
                 _logger.trace(_traceLevels.networkCat, s);
             }
+            throw ex;
         }
-        return new TcpTransceiver(_instance, fd, connected);
     }
 
     public short