fixed inc/decProxyCount & async requests

2 files changed, 22 insertions, 3 deletions

diff --git a/java/src/IceInternal/Connection.java b/java/src/IceInternal/Connection.java
index e2835e9f8dd..9f0e91cebec 100644
--- a/java/src/IceInternal/Connection.java
+++ b/java/src/IceInternal/Connection.java
@@ -176,10 +176,16 @@ public final class Connection extends EventHandler
     {
 	assert(_proxyCount > 0);
 	--_proxyCount;
-	if(_proxyCount == 0 && _adapter == null)
+
+	//
+	// We close the connection if
+	// - no proxy uses this connection anymore; and
+	// - there are not outstanding asynchronous requests; and
+	// - this is an outgoing connection only.
+	//
+	if(_proxyCount == 0 && _asyncRequests.isEmpty() && _adapter == null)
 	{
 	    assert(_requests.isEmpty());
-	    assert(_asyncRequests.isEmpty());
 	    setState(StateClosing, new Ice.CloseConnectionException());
 	}
     }
@@ -661,6 +667,18 @@ public final class Connection extends EventHandler
 			    {
 				throw new Ice.UnknownRequestIdException();
 			    }
+
+			    //
+			    // We close the connection if
+			    // - no proxy uses this connection anymore; and
+			    // - there are not outstanding asynchronous requests; and
+			    // - this is an outgoing connection only.
+			    //
+			    if(_proxyCount == 0 && _asyncRequests.isEmpty() && _adapter == null)
+			    {
+				assert(_requests.isEmpty());
+				setState(StateClosing, new Ice.CloseConnectionException());
+			    }
                         }
                         break;
                     }
diff --git a/java/src/IceInternal/OutgoingAsync.java b/java/src/IceInternal/OutgoingAsync.java
index 7eee5b266f4..5f10f877b4c 100644
--- a/java/src/IceInternal/OutgoingAsync.java
+++ b/java/src/IceInternal/OutgoingAsync.java
@@ -95,9 +95,10 @@ public abstract class OutgoingAsync
 	{
 	    _connection.sendAsyncRequest(this);
 	}
-	finally
+        catch(RuntimeException ex)
 	{
 	    destroy();
+	    throw ex;
 	}
     }