1 files changed, 12 insertions, 0 deletions
diff --git a/cpp/src/Ice/ConnectionI.cpp b/cpp/src/Ice/ConnectionI.cpp
index e8c80f3577a..32ddfd518a1 100644
--- a/cpp/src/Ice/ConnectionI.cpp
+++ b/cpp/src/Ice/ConnectionI.cpp
@@ -232,6 +232,12 @@ void
 Ice::ConnectionI::activate()
 {
     IceUtil::Monitor<IceUtil::Mutex>::Lock sync(*this);
+
+    while(_state == StateNotValidated)
+    {
+	wait();
+    }
+
     setState(StateActive);
 }
 
@@ -239,6 +245,12 @@ void
 Ice::ConnectionI::hold()
 {
     IceUtil::Monitor<IceUtil::Mutex>::Lock sync(*this);
+
+    while(_state == StateNotValidated)
+    {
+	wait();
+    }
+
     setState(StateHolding);
 }