1 files changed, 1 insertions, 20 deletions
diff --git a/cpp/test/IceBox/admin/TestI.cpp b/cpp/test/IceBox/admin/TestI.cpp
index 6a846a31dee..cdfd785c8ed 100644
--- a/cpp/test/IceBox/admin/TestI.cpp
+++ b/cpp/test/IceBox/admin/TestI.cpp
@@ -12,8 +12,7 @@
 
 using namespace Test;
 
-TestFacetI::TestFacetI() :
-    _called(false)
+TestFacetI::TestFacetI()
 {
 }
 
@@ -21,21 +20,6 @@ Ice::PropertyDict
 TestFacetI::getChanges(const Ice::Current&)
 {
     IceUtil::Monitor<IceUtil::Mutex>::Lock sync(*this);
-
-    //
-    // The client calls PropertiesAdmin::setProperties() and then invokes
-    // this operation. Since setProperties() is implemented using AMD, the
-    // client might receive its reply and then call getChanges() before our
-    // updated() method is called. We block here to ensure that updated()
-    // gets called before we return the most recent set of changes.
-    //
-    while(!_called)
-    {
-        wait();
-    }
-
-    _called = false;
-
     return _changes;
 }
 
@@ -43,8 +27,5 @@ void
 TestFacetI::updated(const Ice::PropertyDict& changes)
 {
     IceUtil::Monitor<IceUtil::Mutex>::Lock sync(*this);
-
     _changes = changes;
-    _called = true;
-    notify();
 }