rewrote connection validation code

9 files changed, 95 insertions, 160 deletions

diff --git a/java/src/Ice/ObjectPrxHelper.java b/java/src/Ice/ObjectPrxHelper.java
index f1fb70026c5..77fa9172f56 100644
--- a/java/src/Ice/ObjectPrxHelper.java
+++ b/java/src/Ice/ObjectPrxHelper.java
@@ -517,26 +517,7 @@ public class ObjectPrxHelper implements ObjectPrx
 	    _delegate = null;
 	}
 
-        try
-        {
-            throw ex;
-        }
-        catch(CloseConnectionException e)
-        {
-	    ++cnt;
-        }
-        catch(SocketException e)
-        {
-            ++cnt;
-        }
-        catch(DNSException e)
-        {
-            ++cnt;
-        }
-        catch(TimeoutException e)
-        {
-            ++cnt;
-        }
+	++cnt;
 
         IceInternal.TraceLevels traceLevels = _reference.instance.traceLevels();
         Logger logger = _reference.instance.logger();
diff --git a/java/src/IceInternal/Connection.java b/java/src/IceInternal/Connection.java
index ec025e0ffc5..f99b9a67098 100644
--- a/java/src/IceInternal/Connection.java
+++ b/java/src/IceInternal/Connection.java
@@ -27,6 +27,85 @@ public final class Connection extends EventHandler
     }
 
     public void
+    validate()
+    {
+        _mutex.lock();
+        try
+        {
+	    if(_endpoint.datagram())
+	    {
+		//
+		// Datagram connections are always implicitly validated.
+		//
+		return;
+	    }
+
+	    try
+	    {
+		if(_adapter != null)
+		{
+		    //
+		    // Incoming connections play the active role with
+		    // respect to connection validation.
+		    //
+		    BasicStream os = new BasicStream(_instance);
+		    os.writeByte(Protocol.protocolVersion);
+		    os.writeByte(Protocol.encodingVersion);
+		    os.writeByte(Protocol.validateConnectionMsg);
+		    os.writeInt(Protocol.headerSize); // Message size.
+		    TraceUtil.traceHeader("sending validate connection", os, _logger, _traceLevels);
+		    _transceiver.write(os, _endpoint.timeout());
+		}
+		else
+		{
+		    //
+		    // Outgoing connection play the passive role with
+		    // respect to connection validation.
+		    //
+		    BasicStream is = new BasicStream(_instance);
+		    is.resize(Protocol.headerSize, true);
+		    is.pos(0);
+		    _transceiver.read(is, _endpoint.timeout());
+		    int pos = is.pos();
+		    assert(pos >= Protocol.headerSize);
+		    is.pos(0);
+		    byte protVer = is.readByte();
+		    if(protVer != Protocol.protocolVersion)
+		    {
+			throw new Ice.UnsupportedProtocolException();
+		    }
+		    byte encVer = is.readByte();
+		    if(encVer != Protocol.encodingVersion)
+		    {
+			throw new Ice.UnsupportedEncodingException();
+		    }
+		    byte messageType = is.readByte();
+		    if(messageType != Protocol.validateConnectionMsg)
+		    {
+			throw new Ice.ConnectionNotValidatedException();
+		    }
+		    int size = is.readInt();
+		    if(size != Protocol.headerSize)
+		    {
+			throw new Ice.IllegalMessageSizeException();
+		    }
+		    TraceUtil.traceHeader("received validate connection", is, _logger, _traceLevels);
+		}
+	    }
+            catch(Ice.LocalException ex)
+            {
+                setState(StateClosed, ex);
+		assert(_exception != null);
+		throw _exception;
+            }
+	}
+        finally
+        {
+            _mutex.unlock();
+        }
+    }
+
+    public void
     hold()
     {
         _mutex.lock();
@@ -381,22 +460,6 @@ public final class Connection extends EventHandler
                 byte messageType = stream.readByte();
                 stream.pos(Protocol.headerSize);
 
-		//
-		// Check whether the connection is validated.
-		//
-		if(!_connectionValidated && messageType != Protocol.validateConnectionMsg)
-		{
-		    //
-		    // Yes, we must set _connectionValidated to true
-		    // here. The connection gets implicitly validated
-		    // by any kind of message. However, it's still a
-		    // protocol error like any other if no explicit
-		    // connection validation message was sent first.
-		    //
-		    _connectionValidated = true;
-		    throw new Ice.ConnectionNotValidatedException();
-		}
-	    
                 switch(messageType)
                 {
 		    case Protocol.compressedRequestMsg:
@@ -455,18 +518,11 @@ public final class Connection extends EventHandler
                     case Protocol.validateConnectionMsg:
                     {
                         TraceUtil.traceHeader("received validate connection", stream, _logger, _traceLevels);
-                        if(_endpoint.datagram())
-                        {
-                            if(_warn)
-                            {
-                                _logger.warning("ignoring validate connection message for datagram connection:\n" +
-                                                _transceiver.toString());
-                            }
-                        }
-                        else
-                        {
-			    _connectionValidated = true;
-                        }
+			if(_warn)
+			{
+			    _logger.warning("ignoring unexpected validate connection message:\n" +
+					    _transceiver.toString());
+			}
                         break;
                     }
 
@@ -710,49 +766,6 @@ public final class Connection extends EventHandler
 	_proxyUsageCount = 0;
         _state = StateHolding;
 	_registeredWithPool = false;
-
-	if(_endpoint.datagram())
-	{
-	    //
-	    // Datagram connections are always implicitly validated.
-	    //
-	    _connectionValidated = true;
-	}
-	else
-	{
-	    if(_adapter != null)
-	    {
-		//
-		// Incoming connections play the active role with respect
-		// to connection validation, and are implicitly validated.
-		//
-		try
-		{
-		    validateConnection();
-		}
-		catch(Ice.LocalException ex)
-		{
-		    if(_warn)
-		    {
-			warning("connection exception", ex);
-		    }
-		    _transceiver.close();
-		    _state = StateClosed;
-		    throw ex;
-		}
-		
-		_connectionValidated = true;
-	    }
-	    else
-	    {
-		//
-		// Outgoing connections are passive with respect to
-		// validation, i.e., they wait until they get a
-		// validate connection message from the server.
-		//
-		_connectionValidated = false;
-	    }
-	}
     }
 
     protected void
@@ -818,29 +831,7 @@ public final class Connection extends EventHandler
 
         if(_exception == null)
         {
-	    if(!_connectionValidated && (ex instanceof Ice.ConnectionLostException))
-	    {
-		//
-		// If the connection has not been validated yet, we
-		// treat a connection loss just as if we would have
-		// received a close connection messsage. This way, Ice
-		// will retry a request if the peer just accepts and
-		// closes a connection. This can happen, for example,
-		// if a connection is in the server's backlog, but not
-		// yet accepted by the server. In such case, the
-		// connection has been established from the client
-		// point of view, but not yet from the server point of
-		// view. If the server then closes the acceptor
-		// socket, the client will get a connection loss
-		// without receiving an explicit close connection
-		// message first.
-		//
-		_exception = new Ice.CloseConnectionException();
-	    }
-	    else
-	    {
-		_exception = ex;
-	    }
+	    _exception = ex;
 
             if(_warn)
             {
@@ -956,17 +947,6 @@ public final class Connection extends EventHandler
     }
 
     private void
-    validateConnection()
-    {
-        BasicStream os = new BasicStream(_instance);
-        os.writeByte(Protocol.protocolVersion);
-        os.writeByte(Protocol.encodingVersion);
-        os.writeByte(Protocol.validateConnectionMsg);
-        os.writeInt(Protocol.headerSize); // Message size.
-        _transceiver.write(os, _endpoint.timeout());
-    }
-
-    private void
     closeConnection()
     {
         BasicStream os = new BasicStream(_instance);
@@ -1093,7 +1073,6 @@ public final class Connection extends EventHandler
     private int _proxyUsageCount;
     private int _state;
     private boolean _registeredWithPool;
-    private boolean _connectionValidated;
     private RecursiveMutex _mutex = new RecursiveMutex();
     private Incoming _incomingCache;
 }
diff --git a/java/src/IceInternal/IncomingConnectionFactory.java b/java/src/IceInternal/IncomingConnectionFactory.java
index 21b7fb9026f..dbb59a8f588 100644
--- a/java/src/IceInternal/IncomingConnectionFactory.java
+++ b/java/src/IceInternal/IncomingConnectionFactory.java
@@ -133,6 +133,7 @@ public class IncomingConnectionFactory extends EventHandler
 	{
 	    assert(transceiver != null);
             Connection connection = new Connection(_instance, transceiver, _endpoint, _adapter);
+	    connection.validate();
             connection.activate();
             _connections.add(connection);
 	}
@@ -213,6 +214,7 @@ public class IncomingConnectionFactory extends EventHandler
             {
                 _endpoint = h.value;
                 Connection connection = new Connection(_instance, _transceiver, _endpoint, _adapter);
+		connection.validate();
                 _connections.add(connection);
 
 		//
diff --git a/java/src/IceInternal/OutgoingConnectionFactory.java b/java/src/IceInternal/OutgoingConnectionFactory.java
index 1a743ade447..e2a04ee6ddc 100644
--- a/java/src/IceInternal/OutgoingConnectionFactory.java
+++ b/java/src/IceInternal/OutgoingConnectionFactory.java
@@ -81,19 +81,12 @@ public class OutgoingConnectionFactory
                     assert(transceiver != null);
                 }
                 connection = new Connection(_instance, transceiver, endpoint, null);
+		connection.validate();
                 connection.activate();
                 _connections.put(endpoint, connection);
                 break;
             }
-            catch(Ice.SocketException ex)
-            {
-                exception = ex;
-            }
-            catch(Ice.DNSException ex)
-            {
-                exception = ex;
-            }
-            catch(Ice.TimeoutException ex)
+            catch(Ice.LocalException ex)
             {
                 exception = ex;
             }
diff --git a/java/test/Glacier/starter/CallbackClient.java b/java/test/Glacier/starter/CallbackClient.java
index e1f6027cb50..b77c47d6ac7 100644
--- a/java/test/Glacier/starter/CallbackClient.java
+++ b/java/test/Glacier/starter/CallbackClient.java
@@ -166,11 +166,7 @@ class CallbackClient extends Ice.Application
             router.ice_ping();
             test(false);
         }
-        catch(Ice.CloseConnectionException ex)
-        {
-            System.out.println("ok");
-        }
-        catch(Ice.ConnectFailedException ex)
+        catch(Ice.LocalException ex)
         {
             System.out.println("ok");
         }
diff --git a/java/test/Ice/faultTolerance/AllTests.java b/java/test/Ice/faultTolerance/AllTests.java
index 5f858cd160c..bba9cb681d1 100644
--- a/java/test/Ice/faultTolerance/AllTests.java
+++ b/java/test/Ice/faultTolerance/AllTests.java
@@ -113,11 +113,7 @@ public class AllTests
             obj.ice_ping();
             test(false);
         }
-        catch(Ice.CloseConnectionException ex)
-        {
-            System.out.println("ok");
-        }
-        catch(Ice.ConnectFailedException ex)
+        catch(Ice.LocalException ex)
         {
             System.out.println("ok");
         }
diff --git a/java/test/Ice/location/AllTests.java b/java/test/Ice/location/AllTests.java
index 16a5507567e..7ca0c216803 100644
--- a/java/test/Ice/location/AllTests.java
+++ b/java/test/Ice/location/AllTests.java
@@ -109,11 +109,7 @@ public class AllTests
 	    obj2.ice_ping();
 	    test(false);
 	}
-        catch(Ice.CloseConnectionException ex)
-        {
-            System.out.println("ok");
-        }
-        catch(Ice.ConnectFailedException ex)
+        catch(Ice.LocalException ex)
         {
             System.out.println("ok");
         }
diff --git a/java/test/Ice/locationForward/AllTests.java b/java/test/Ice/locationForward/AllTests.java
index 420931987c6..adb4e855cb0 100644
--- a/java/test/Ice/locationForward/AllTests.java
+++ b/java/test/Ice/locationForward/AllTests.java
@@ -54,11 +54,7 @@ public class AllTests
             lastObj.ice_ping();
             test(false);
         }
-        catch(Ice.CloseConnectionException ex)
-        {
-            System.out.println("ok");
-        }
-        catch(Ice.ConnectFailedException ex)
+        catch(Ice.LocalException ex)
         {
             System.out.println("ok");
         }
diff --git a/java/test/Ice/operations/Client.java b/java/test/Ice/operations/Client.java
index bb4068c4c09..204ce57520e 100644
--- a/java/test/Ice/operations/Client.java
+++ b/java/test/Ice/operations/Client.java
@@ -23,11 +23,7 @@ public class Client
             myClass.opVoid();
             throw new RuntimeException();
         }
-        catch(Ice.CloseConnectionException ex)
-        {
-            System.out.println("ok");
-        }
-        catch(Ice.ConnectFailedException ex)
+        catch(Ice.LocalException ex)
         {
             System.out.println("ok");
         }