Fixed dispatcher test hang (fixes #123)

1 files changed, 6 insertions, 4 deletions

diff --git a/cpp/test/Ice/dispatcher/Client.cpp b/cpp/test/Ice/dispatcher/Client.cpp
index 6767b901b9f..79515af000b 100644
--- a/cpp/test/Ice/dispatcher/Client.cpp
+++ b/cpp/test/Ice/dispatcher/Client.cpp
@@ -41,11 +41,13 @@ Client::run(int argc, char** argv)
 #else
     initData.dispatcher = new Dispatcher();
 #endif
-    Ice::CommunicatorHolder communicator = initialize(argc, argv, initData);
-
-    void allTests(Test::TestHelper*);
-    allTests(this);
+    // The communicator must be destroyed before the dispatcher is terminated.
+    {
+        Ice::CommunicatorHolder communicator = initialize(argc, argv, initData);
 
+        void allTests(Test::TestHelper*);
+        allTests(this);
+    }
     Dispatcher::terminate();
 }