Bug fixes

1 files changed, 21 insertions, 12 deletions

diff --git a/cpp/src/Ice/PropertiesAdminI.cpp b/cpp/src/Ice/PropertiesAdminI.cpp
index fc929bb959a..93650cc5259 100644
--- a/cpp/src/Ice/PropertiesAdminI.cpp
+++ b/cpp/src/Ice/PropertiesAdminI.cpp
@@ -40,7 +40,7 @@ Ice::PropertiesAdminI::setProperties_async(const AMD_PropertiesAdmin_setProperti
                                            const Ice::Current&)
 {
     PropertyDict added, changed, removed;
-    PropertiesAdminUpdateCallbackPtr callback;
+    vector<PropertiesAdminUpdateCallbackPtr> callbacks;
     {
         IceUtil::Mutex::Lock sync(*this);
 
@@ -154,7 +154,7 @@ Ice::PropertiesAdminI::setProperties_async(const AMD_PropertiesAdmin_setProperti
             _properties->setProperty(p->first, "");
         }
 
-        callback = _updateCallback;
+        callbacks = _updateCallbacks;
     }
 
     //
@@ -162,26 +162,35 @@ Ice::PropertiesAdminI::setProperties_async(const AMD_PropertiesAdmin_setProperti
     //
     cb->ice_response();
 
-    if(callback)
+    if(!callbacks.empty())
     {
         PropertyDict changes = added;
         changes.insert(changed.begin(), changed.end());
         changes.insert(removed.begin(), removed.end());
-
-        try
-        {
-            callback->updated(changes);
-        }
-        catch(...)
+        for(vector<PropertiesAdminUpdateCallbackPtr>::const_iterator p = callbacks.begin(); p != callbacks.end(); ++p)
         {
-            // Ignore.
+            try
+            {
+                (*p)->updated(changes);
+            }
+            catch(...)
+            {
+                // Ignore.
+            }
         }
     }
 }
 
 void
-Ice::PropertiesAdminI::setUpdateCallback(const PropertiesAdminUpdateCallbackPtr& cb)
+Ice::PropertiesAdminI::addUpdateCallback(const PropertiesAdminUpdateCallbackPtr& cb)
+{
+    IceUtil::Mutex::Lock sync(*this);
+    _updateCallbacks.push_back(cb);
+}
+
+void
+Ice::PropertiesAdminI::removeUpdateCallback(const PropertiesAdminUpdateCallbackPtr& cb)
 {
     IceUtil::Mutex::Lock sync(*this);
-    _updateCallback = cb;
+    _updateCallbacks.erase(remove(_updateCallbacks.begin(), _updateCallbacks.end(), cb), _updateCallbacks.end());
 }