Added CHANGELOG entry for IceGrid bug and fix to use getPropertyAsInt

2 files changed, 10 insertions, 9 deletions

diff --git a/CHANGELOG-3.6.md b/CHANGELOG-3.6.md
index 6b26b7de5b0..7f00d2063b2 100644
--- a/CHANGELOG-3.6.md
+++ b/CHANGELOG-3.6.md
@@ -37,6 +37,15 @@ particular aspect of Ice.
   - [Python Changes](#python-changes-2)
   - [Ruby Changes](#ruby-changes-1)
 
+# Changes in Ice 3.6.4
+
+These are the changes since Ice 3.6.4.
+
+## General Changes
+
+- Fixed IceGrid bug where updating properties of an IceBox service at runtime
+  would fail if the service used the IceBox shared communicator. Thanks to
+  Andreas Sommer for the bug report and fix.
 
 # Changes in Ice 3.6.3
 
diff --git a/cpp/src/IceGrid/ServerI.cpp b/cpp/src/IceGrid/ServerI.cpp
index 7ce139df955..2fa09214669 100644
--- a/cpp/src/IceGrid/ServerI.cpp
+++ b/cpp/src/IceGrid/ServerI.cpp
@@ -341,15 +341,7 @@ private:
         {
             assert(_p->first.find("config_") == 0);
             const string service = _p->first.substr(7);
-            bool useSharedCommunicator = false;
-            for (PropertyDescriptorSeq::const_iterator d = _properties.at("config").begin(); d != _properties.at("config").end(); ++d)
-            {
-                if (d->name == "IceBox.UseSharedCommunicator." + service)
-                {
-                   useSharedCommunicator = (atoi(d->value.c_str()) > 0);
-                }
-            }
-            if (useSharedCommunicator)
+            if(getPropertyAsInt(_properties.at("config"), "IceBox.UseSharedCommunicator." + service) > 0)
             {
                 facet = "IceBox.SharedCommunicator.Properties";
             }