6 files changed, 13 insertions, 25 deletions
diff --git a/cpp/test/Freeze/evictor/TestI.cpp b/cpp/test/Freeze/evictor/TestI.cpp
index 7c8fbcb90b0..be86a10f3c1 100644
--- a/cpp/test/Freeze/evictor/TestI.cpp
+++ b/cpp/test/Freeze/evictor/TestI.cpp
@@ -307,8 +307,7 @@ Test::RemoteEvictorI::saveNow(const Current& current)
 void
 Test::RemoteEvictorI::deactivate(const Current& current)
 {
-    _evictorAdapter->deactivate();
-    _evictorAdapter->waitForDeactivate();
+    _evictorAdapter->destroy();
     _adapter->remove(_adapter->getCommunicator()->stringToIdentity(_category));
 }
 
diff --git a/cpp/test/Freeze/oldevictor/TestI.cpp b/cpp/test/Freeze/oldevictor/TestI.cpp
index 7c8fbcb90b0..be86a10f3c1 100644
--- a/cpp/test/Freeze/oldevictor/TestI.cpp
+++ b/cpp/test/Freeze/oldevictor/TestI.cpp
@@ -307,8 +307,7 @@ Test::RemoteEvictorI::saveNow(const Current& current)
 void
 Test::RemoteEvictorI::deactivate(const Current& current)
 {
-    _evictorAdapter->deactivate();
-    _evictorAdapter->waitForDeactivate();
+    _evictorAdapter->destroy();
     _adapter->remove(_adapter->getCommunicator()->stringToIdentity(_category));
 }
 
diff --git a/cpp/test/Ice/adapterDeactivation/AllTests.cpp b/cpp/test/Ice/adapterDeactivation/AllTests.cpp
index c4a9cc5f32d..a4577f18a3a 100644
--- a/cpp/test/Ice/adapterDeactivation/AllTests.cpp
+++ b/cpp/test/Ice/adapterDeactivation/AllTests.cpp
@@ -41,14 +41,13 @@ allTests(const CommunicatorPtr& communicator)
 	catch(const AlreadyRegisteredException&)
 	{
 	}
-	adapter->deactivate();
-	adapter->waitForDeactivate();
+	adapter->destroy();
+
 	//
 	// Use a different port than the first adapter to avoid an "address already in use" error.
 	//
 	adapter = communicator->createObjectAdapterWithEndpoints("TransientTestAdapter", "default -p 9998");
-	adapter->deactivate();
-	adapter->waitForDeactivate();
+	adapter->destroy();
         cout << "ok" << endl;
     }
 
diff --git a/cpp/test/Ice/adapterDeactivation/TestI.cpp b/cpp/test/Ice/adapterDeactivation/TestI.cpp
index f9c33004155..d4539f12093 100644
--- a/cpp/test/Ice/adapterDeactivation/TestI.cpp
+++ b/cpp/test/Ice/adapterDeactivation/TestI.cpp
@@ -22,8 +22,7 @@ TestI::transient(const Current& current)
     ObjectAdapterPtr adapter =
 	communicator->createObjectAdapterWithEndpoints("TransientTestAdapter", "default -p 9999");
     adapter->activate();
-    adapter->deactivate();
-    adapter->waitForDeactivate();
+    adapter->destroy();
 }
 
 void
diff --git a/cpp/test/Ice/binding/TestI.cpp b/cpp/test/Ice/binding/TestI.cpp
index 6f67ec0bf9a..68fa9114a74 100644
--- a/cpp/test/Ice/binding/TestI.cpp
+++ b/cpp/test/Ice/binding/TestI.cpp
@@ -54,8 +54,7 @@ RemoteObjectAdapterI::deactivate(const Ice::Current&)
 {
     try
     {
-	_adapter->deactivate();
-	_adapter->waitForDeactivate();
+	_adapter->destroy();
     }
     catch(const ObjectAdapterDeactivatedException&)
     {
diff --git a/cpp/test/IceGrid/session/AllTests.cpp b/cpp/test/IceGrid/session/AllTests.cpp
index e40196c5a06..21487bd237b 100644
--- a/cpp/test/IceGrid/session/AllTests.cpp
+++ b/cpp/test/IceGrid/session/AllTests.cpp
@@ -1387,11 +1387,8 @@ allTests(const Ice::CommunicatorPtr& communicator)
 	}
 	session2->destroy();
 
-	adpt1->deactivate();
-	adpt2->deactivate();
-
-	adpt1->waitForDeactivate();
-	adpt2->waitForDeactivate();
+	adpt1->destroy();
+	adpt2->destroy();
 
 	//
 	// TODO: test session reaping?
@@ -1490,8 +1487,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
 	}
 
  	session1->destroy();
- 	adpt1->deactivate();
- 	adpt1->waitForDeactivate();
+ 	adpt1->destroy();
 
 	cout << "ok" << endl;
     }
@@ -1575,8 +1571,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
 	}
 
  	session1->destroy();
- 	adpt1->deactivate();
- 	adpt1->waitForDeactivate();
+ 	adpt1->destroy();
 
 	cout << "ok" << endl;
     }
@@ -1630,8 +1625,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
 	}
 
  	session1->destroy();
- 	adpt1->deactivate();
- 	adpt1->waitForDeactivate();
+ 	adpt1->destroy();
 
 	cout << "ok" << endl;
     }
@@ -1743,8 +1737,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
 // 	nodeObs1->waitForUpdate(__FILE__, __LINE__); // serverUpdate(Destroyed)
 
 // 	session1->destroy();
-// 	adpt1->deactivate();
-// 	adpt1->waitForDeactivate();
+// 	adpt1->destroy();
 
 // 	cout << "ok" << endl;
     }