fix for bug 930: race condition in connection processing

1 files changed, 23 insertions, 1 deletions

diff --git a/java/src/Ice/ConnectionI.java b/java/src/Ice/ConnectionI.java
index 5465b018d68..7fe19e7029f 100644
--- a/java/src/Ice/ConnectionI.java
+++ b/java/src/Ice/ConnectionI.java
@@ -60,7 +60,7 @@ public final class ConnectionI extends IceInternal.EventHandler implements Conne
 		    
 		    return;
 		}
-		
+
 		//
 		// The connection might already be closed (e.g.: the communicator 
 		// was destroyed or object adapter deactivated.)
@@ -212,12 +212,34 @@ public final class ConnectionI extends IceInternal.EventHandler implements Conne
     public synchronized void
     activate()
     {
+	while(_state == StateNotValidated)
+	{
+	    try
+	    {
+		wait();
+	    }
+	    catch(InterruptedException ex)
+	    {
+	    }
+	}
+
 	setState(StateActive);
     }
 
     public synchronized void
     hold()
     {
+	while(_state == StateNotValidated)
+	{
+	    try
+	    {
+		wait();
+	    }
+	    catch(InterruptedException ex)
+	    {
+	    }
+	}
+
 	setState(StateHolding);
     }