From bb485367b90219b73d9c5d07abee15f0b4a7bf9d Mon Sep 17 00:00:00 2001
From: Dwayne Boone <dwayne@zeroc.com>
Date: Tue, 6 Mar 2007 14:19:17 +0000
Subject: Bug 1970

---
 cpp/demo/Ice/async/Server.cpp | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

(limited to 'cpp/demo/Ice/async/Server.cpp')

diff --git a/cpp/demo/Ice/async/Server.cpp b/cpp/demo/Ice/async/Server.cpp
index a3d94180741..0e1f0ee4fcf 100644
--- a/cpp/demo/Ice/async/Server.cpp
+++ b/cpp/demo/Ice/async/Server.cpp
@@ -45,6 +45,7 @@ AsyncServer::run(int argc, char* argv[])
     adapter->activate();
 
     communicator()->waitForShutdown();
+    _workQueue->getThreadControl().join();
     return EXIT_SUCCESS;
 }
 
@@ -52,18 +53,5 @@ void
 AsyncServer::interruptCallback(int)
 {
     _workQueue->destroy();
-    _workQueue->getThreadControl().join();
-
-    try
-    {
-        communicator()->destroy();
-    }
-    catch(const IceUtil::Exception& ex)
-    {
-        cerr << appName() << ": " << ex << endl;
-    }
-    catch(...)
-    {
-        cerr << appName() << ": unknown exception" << endl;
-    }
+    communicator()->shutdown();
 }
-- 
cgit v1.2.3