1 files changed, 10 insertions, 2 deletions
diff --git a/cpp/test/Ice/hold/TestI.cpp b/cpp/test/Ice/hold/TestI.cpp
index 00d3de083d9..964a05b7ff7 100644
--- a/cpp/test/Ice/hold/TestI.cpp
+++ b/cpp/test/Ice/hold/TestI.cpp
@@ -13,12 +13,20 @@
 void
 HoldI::putOnHold(Ice::Int seconds, const Ice::Current& current)
 {
-    current.adapter->hold();
-    current.adapter->activate();
+    if(seconds <= 0)
+    {
+	current.adapter->hold();
+	current.adapter->activate();
+    }
+    else
+    {
+	assert(false); // TODO
+    }
 }
 
 void
 HoldI::shutdown(const Ice::Current& current)
 {
+    current.adapter->hold();
     current.adapter->getCommunicator()->shutdown();
 }