3 files changed, 3 insertions, 6 deletions
diff --git a/cpp/demo/Freeze/library/Collocated.cpp b/cpp/demo/Freeze/library/Collocated.cpp
index a309690b169..f3ae12a21bb 100644
--- a/cpp/demo/Freeze/library/Collocated.cpp
+++ b/cpp/demo/Freeze/library/Collocated.cpp
@@ -86,8 +86,7 @@ LibraryCollocated::run(int argc, char* argv[])
     //
     int runParser(int, char*[], const Ice::CommunicatorPtr&);
     int status = runParser(argc, argv, communicator());
-    adapter->deactivate();
-    adapter->waitForDeactivate();
+    adapter->destroy();
 
     return status;
 }
diff --git a/cpp/demo/Freeze/phonebook/Collocated.cpp b/cpp/demo/Freeze/phonebook/Collocated.cpp
index 3bc286cfa32..6dba2555651 100644
--- a/cpp/demo/Freeze/phonebook/Collocated.cpp
+++ b/cpp/demo/Freeze/phonebook/Collocated.cpp
@@ -103,8 +103,7 @@ PhoneBookCollocated::run(int argc, char* argv[])
     //
     int runParser(int, char*[], const Ice::CommunicatorPtr&);
     int status = runParser(argc, argv, communicator());
-    adapter->deactivate();
-    adapter->waitForDeactivate();
+    adapter->destroy();
 
     return status;
 }
diff --git a/cpp/demo/IceBox/hello/HelloServiceI.cpp b/cpp/demo/IceBox/hello/HelloServiceI.cpp
index af0408d3bcd..135bd4a8384 100644
--- a/cpp/demo/IceBox/hello/HelloServiceI.cpp
+++ b/cpp/demo/IceBox/hello/HelloServiceI.cpp
@@ -46,6 +46,5 @@ HelloServiceI::start(const string& name, const Ice::CommunicatorPtr& communicato
 void
 HelloServiceI::stop()
 {
-    _adapter->deactivate();
-    _adapter->waitForDeactivate();
+    _adapter->destroy();
 }