Merge remote-tracking branch 'origin/3.6'

4 files changed, 92 insertions, 100 deletions

diff --git a/cpp/src/Ice/PropertyNames.cpp b/cpp/src/Ice/PropertyNames.cpp
index 1bf95a2df3b..7fd76b56b12 100644
--- a/cpp/src/Ice/PropertyNames.cpp
+++ b/cpp/src/Ice/PropertyNames.cpp
@@ -6,7 +6,7 @@
 // ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
-// Generated by makeprops.py from file ../config/PropertyNames.xml, Tue Oct 18 11:38:00 2016
+// Generated by makeprops.py from file ./config/PropertyNames.xml, Wed Nov 16 09:52:45 2016
 
 // IMPORTANT: Do not edit this file -- any edits made here will be lost!
 
@@ -336,95 +336,95 @@ const IceInternal::PropertyArray
     IceInternal::PropertyNames::IceDiscoveryProps(IceDiscoveryPropsData,
                                                 sizeof(IceDiscoveryPropsData)/sizeof(IceDiscoveryPropsData[0]));
 
-const IceInternal::Property IceGridDiscoveryPropsData[] = 
+const IceInternal::Property IceLocatorDiscoveryPropsData[] = 
 {
-    IceInternal::Property("IceGridDiscovery.Reply.ACM.Timeout", false, 0),
-    IceInternal::Property("IceGridDiscovery.Reply.ACM.Heartbeat", false, 0),
-    IceInternal::Property("IceGridDiscovery.Reply.ACM.Close", false, 0),
-    IceInternal::Property("IceGridDiscovery.Reply.ACM", false, 0),
-    IceInternal::Property("IceGridDiscovery.Reply.AdapterId", false, 0),
-    IceInternal::Property("IceGridDiscovery.Reply.Endpoints", false, 0),
-    IceInternal::Property("IceGridDiscovery.Reply.Locator.EndpointSelection", false, 0),
-    IceInternal::Property("IceGridDiscovery.Reply.Locator.ConnectionCached", false, 0),
-    IceInternal::Property("IceGridDiscovery.Reply.Locator.PreferSecure", false, 0),
-    IceInternal::Property("IceGridDiscovery.Reply.Locator.LocatorCacheTimeout", false, 0),
-    IceInternal::Property("IceGridDiscovery.Reply.Locator.InvocationTimeout", false, 0),
-    IceInternal::Property("IceGridDiscovery.Reply.Locator.Locator", false, 0),
-    IceInternal::Property("IceGridDiscovery.Reply.Locator.Router", false, 0),
-    IceInternal::Property("IceGridDiscovery.Reply.Locator.CollocationOptimized", false, 0),
-    IceInternal::Property("IceGridDiscovery.Reply.Locator.Context.*", false, 0),
-    IceInternal::Property("IceGridDiscovery.Reply.Locator", false, 0),
-    IceInternal::Property("IceGridDiscovery.Reply.PublishedEndpoints", false, 0),
-    IceInternal::Property("IceGridDiscovery.Reply.ReplicaGroupId", false, 0),
-    IceInternal::Property("IceGridDiscovery.Reply.Router.EndpointSelection", false, 0),
-    IceInternal::Property("IceGridDiscovery.Reply.Router.ConnectionCached", false, 0),
-    IceInternal::Property("IceGridDiscovery.Reply.Router.PreferSecure", false, 0),
-    IceInternal::Property("IceGridDiscovery.Reply.Router.LocatorCacheTimeout", false, 0),
-    IceInternal::Property("IceGridDiscovery.Reply.Router.InvocationTimeout", false, 0),
-    IceInternal::Property("IceGridDiscovery.Reply.Router.Locator", false, 0),
-    IceInternal::Property("IceGridDiscovery.Reply.Router.Router", false, 0),
-    IceInternal::Property("IceGridDiscovery.Reply.Router.CollocationOptimized", false, 0),
-    IceInternal::Property("IceGridDiscovery.Reply.Router.Context.*", false, 0),
-    IceInternal::Property("IceGridDiscovery.Reply.Router", false, 0),
-    IceInternal::Property("IceGridDiscovery.Reply.ProxyOptions", false, 0),
-    IceInternal::Property("IceGridDiscovery.Reply.ThreadPool.Size", false, 0),
-    IceInternal::Property("IceGridDiscovery.Reply.ThreadPool.SizeMax", false, 0),
-    IceInternal::Property("IceGridDiscovery.Reply.ThreadPool.SizeWarn", false, 0),
-    IceInternal::Property("IceGridDiscovery.Reply.ThreadPool.StackSize", false, 0),
-    IceInternal::Property("IceGridDiscovery.Reply.ThreadPool.Serialize", false, 0),
-    IceInternal::Property("IceGridDiscovery.Reply.ThreadPool.ThreadIdleTime", false, 0),
-    IceInternal::Property("IceGridDiscovery.Reply.ThreadPool.ThreadPriority", false, 0),
-    IceInternal::Property("IceGridDiscovery.Reply.MessageSizeMax", false, 0),
-    IceInternal::Property("IceGridDiscovery.Locator.ACM.Timeout", false, 0),
-    IceInternal::Property("IceGridDiscovery.Locator.ACM.Heartbeat", false, 0),
-    IceInternal::Property("IceGridDiscovery.Locator.ACM.Close", false, 0),
-    IceInternal::Property("IceGridDiscovery.Locator.ACM", false, 0),
-    IceInternal::Property("IceGridDiscovery.Locator.AdapterId", false, 0),
-    IceInternal::Property("IceGridDiscovery.Locator.Endpoints", false, 0),
-    IceInternal::Property("IceGridDiscovery.Locator.Locator.EndpointSelection", false, 0),
-    IceInternal::Property("IceGridDiscovery.Locator.Locator.ConnectionCached", false, 0),
-    IceInternal::Property("IceGridDiscovery.Locator.Locator.PreferSecure", false, 0),
-    IceInternal::Property("IceGridDiscovery.Locator.Locator.LocatorCacheTimeout", false, 0),
-    IceInternal::Property("IceGridDiscovery.Locator.Locator.InvocationTimeout", false, 0),
-    IceInternal::Property("IceGridDiscovery.Locator.Locator.Locator", false, 0),
-    IceInternal::Property("IceGridDiscovery.Locator.Locator.Router", false, 0),
-    IceInternal::Property("IceGridDiscovery.Locator.Locator.CollocationOptimized", false, 0),
-    IceInternal::Property("IceGridDiscovery.Locator.Locator.Context.*", false, 0),
-    IceInternal::Property("IceGridDiscovery.Locator.Locator", false, 0),
-    IceInternal::Property("IceGridDiscovery.Locator.PublishedEndpoints", false, 0),
-    IceInternal::Property("IceGridDiscovery.Locator.ReplicaGroupId", false, 0),
-    IceInternal::Property("IceGridDiscovery.Locator.Router.EndpointSelection", false, 0),
-    IceInternal::Property("IceGridDiscovery.Locator.Router.ConnectionCached", false, 0),
-    IceInternal::Property("IceGridDiscovery.Locator.Router.PreferSecure", false, 0),
-    IceInternal::Property("IceGridDiscovery.Locator.Router.LocatorCacheTimeout", false, 0),
-    IceInternal::Property("IceGridDiscovery.Locator.Router.InvocationTimeout", false, 0),
-    IceInternal::Property("IceGridDiscovery.Locator.Router.Locator", false, 0),
-    IceInternal::Property("IceGridDiscovery.Locator.Router.Router", false, 0),
-    IceInternal::Property("IceGridDiscovery.Locator.Router.CollocationOptimized", false, 0),
-    IceInternal::Property("IceGridDiscovery.Locator.Router.Context.*", false, 0),
-    IceInternal::Property("IceGridDiscovery.Locator.Router", false, 0),
-    IceInternal::Property("IceGridDiscovery.Locator.ProxyOptions", false, 0),
-    IceInternal::Property("IceGridDiscovery.Locator.ThreadPool.Size", false, 0),
-    IceInternal::Property("IceGridDiscovery.Locator.ThreadPool.SizeMax", false, 0),
-    IceInternal::Property("IceGridDiscovery.Locator.ThreadPool.SizeWarn", false, 0),
-    IceInternal::Property("IceGridDiscovery.Locator.ThreadPool.StackSize", false, 0),
-    IceInternal::Property("IceGridDiscovery.Locator.ThreadPool.Serialize", false, 0),
-    IceInternal::Property("IceGridDiscovery.Locator.ThreadPool.ThreadIdleTime", false, 0),
-    IceInternal::Property("IceGridDiscovery.Locator.ThreadPool.ThreadPriority", false, 0),
-    IceInternal::Property("IceGridDiscovery.Locator.MessageSizeMax", false, 0),
-    IceInternal::Property("IceGridDiscovery.Lookup", false, 0),
-    IceInternal::Property("IceGridDiscovery.Timeout", false, 0),
-    IceInternal::Property("IceGridDiscovery.RetryCount", false, 0),
-    IceInternal::Property("IceGridDiscovery.RetryDelay", false, 0),
-    IceInternal::Property("IceGridDiscovery.Address", false, 0),
-    IceInternal::Property("IceGridDiscovery.Port", false, 0),
-    IceInternal::Property("IceGridDiscovery.Interface", false, 0),
-    IceInternal::Property("IceGridDiscovery.InstanceName", false, 0),
+    IceInternal::Property("IceLocatorDiscovery.Reply.ACM.Timeout", false, 0),
+    IceInternal::Property("IceLocatorDiscovery.Reply.ACM.Heartbeat", false, 0),
+    IceInternal::Property("IceLocatorDiscovery.Reply.ACM.Close", false, 0),
+    IceInternal::Property("IceLocatorDiscovery.Reply.ACM", false, 0),
+    IceInternal::Property("IceLocatorDiscovery.Reply.AdapterId", false, 0),
+    IceInternal::Property("IceLocatorDiscovery.Reply.Endpoints", false, 0),
+    IceInternal::Property("IceLocatorDiscovery.Reply.Locator.EndpointSelection", false, 0),
+    IceInternal::Property("IceLocatorDiscovery.Reply.Locator.ConnectionCached", false, 0),
+    IceInternal::Property("IceLocatorDiscovery.Reply.Locator.PreferSecure", false, 0),
+    IceInternal::Property("IceLocatorDiscovery.Reply.Locator.LocatorCacheTimeout", false, 0),
+    IceInternal::Property("IceLocatorDiscovery.Reply.Locator.InvocationTimeout", false, 0),
+    IceInternal::Property("IceLocatorDiscovery.Reply.Locator.Locator", false, 0),
+    IceInternal::Property("IceLocatorDiscovery.Reply.Locator.Router", false, 0),
+    IceInternal::Property("IceLocatorDiscovery.Reply.Locator.CollocationOptimized", false, 0),
+    IceInternal::Property("IceLocatorDiscovery.Reply.Locator.Context.*", false, 0),
+    IceInternal::Property("IceLocatorDiscovery.Reply.Locator", false, 0),
+    IceInternal::Property("IceLocatorDiscovery.Reply.PublishedEndpoints", false, 0),
+    IceInternal::Property("IceLocatorDiscovery.Reply.ReplicaGroupId", false, 0),
+    IceInternal::Property("IceLocatorDiscovery.Reply.Router.EndpointSelection", false, 0),
+    IceInternal::Property("IceLocatorDiscovery.Reply.Router.ConnectionCached", false, 0),
+    IceInternal::Property("IceLocatorDiscovery.Reply.Router.PreferSecure", false, 0),
+    IceInternal::Property("IceLocatorDiscovery.Reply.Router.LocatorCacheTimeout", false, 0),
+    IceInternal::Property("IceLocatorDiscovery.Reply.Router.InvocationTimeout", false, 0),
+    IceInternal::Property("IceLocatorDiscovery.Reply.Router.Locator", false, 0),
+    IceInternal::Property("IceLocatorDiscovery.Reply.Router.Router", false, 0),
+    IceInternal::Property("IceLocatorDiscovery.Reply.Router.CollocationOptimized", false, 0),
+    IceInternal::Property("IceLocatorDiscovery.Reply.Router.Context.*", false, 0),
+    IceInternal::Property("IceLocatorDiscovery.Reply.Router", false, 0),
+    IceInternal::Property("IceLocatorDiscovery.Reply.ProxyOptions", false, 0),
+    IceInternal::Property("IceLocatorDiscovery.Reply.ThreadPool.Size", false, 0),
+    IceInternal::Property("IceLocatorDiscovery.Reply.ThreadPool.SizeMax", false, 0),
+    IceInternal::Property("IceLocatorDiscovery.Reply.ThreadPool.SizeWarn", false, 0),
+    IceInternal::Property("IceLocatorDiscovery.Reply.ThreadPool.StackSize", false, 0),
+    IceInternal::Property("IceLocatorDiscovery.Reply.ThreadPool.Serialize", false, 0),
+    IceInternal::Property("IceLocatorDiscovery.Reply.ThreadPool.ThreadIdleTime", false, 0),
+    IceInternal::Property("IceLocatorDiscovery.Reply.ThreadPool.ThreadPriority", false, 0),
+    IceInternal::Property("IceLocatorDiscovery.Reply.MessageSizeMax", false, 0),
+    IceInternal::Property("IceLocatorDiscovery.Locator.ACM.Timeout", false, 0),
+    IceInternal::Property("IceLocatorDiscovery.Locator.ACM.Heartbeat", false, 0),
+    IceInternal::Property("IceLocatorDiscovery.Locator.ACM.Close", false, 0),
+    IceInternal::Property("IceLocatorDiscovery.Locator.ACM", false, 0),
+    IceInternal::Property("IceLocatorDiscovery.Locator.AdapterId", false, 0),
+    IceInternal::Property("IceLocatorDiscovery.Locator.Endpoints", false, 0),
+    IceInternal::Property("IceLocatorDiscovery.Locator.Locator.EndpointSelection", false, 0),
+    IceInternal::Property("IceLocatorDiscovery.Locator.Locator.ConnectionCached", false, 0),
+    IceInternal::Property("IceLocatorDiscovery.Locator.Locator.PreferSecure", false, 0),
+    IceInternal::Property("IceLocatorDiscovery.Locator.Locator.LocatorCacheTimeout", false, 0),
+    IceInternal::Property("IceLocatorDiscovery.Locator.Locator.InvocationTimeout", false, 0),
+    IceInternal::Property("IceLocatorDiscovery.Locator.Locator.Locator", false, 0),
+    IceInternal::Property("IceLocatorDiscovery.Locator.Locator.Router", false, 0),
+    IceInternal::Property("IceLocatorDiscovery.Locator.Locator.CollocationOptimized", false, 0),
+    IceInternal::Property("IceLocatorDiscovery.Locator.Locator.Context.*", false, 0),
+    IceInternal::Property("IceLocatorDiscovery.Locator.Locator", false, 0),
+    IceInternal::Property("IceLocatorDiscovery.Locator.PublishedEndpoints", false, 0),
+    IceInternal::Property("IceLocatorDiscovery.Locator.ReplicaGroupId", false, 0),
+    IceInternal::Property("IceLocatorDiscovery.Locator.Router.EndpointSelection", false, 0),
+    IceInternal::Property("IceLocatorDiscovery.Locator.Router.ConnectionCached", false, 0),
+    IceInternal::Property("IceLocatorDiscovery.Locator.Router.PreferSecure", false, 0),
+    IceInternal::Property("IceLocatorDiscovery.Locator.Router.LocatorCacheTimeout", false, 0),
+    IceInternal::Property("IceLocatorDiscovery.Locator.Router.InvocationTimeout", false, 0),
+    IceInternal::Property("IceLocatorDiscovery.Locator.Router.Locator", false, 0),
+    IceInternal::Property("IceLocatorDiscovery.Locator.Router.Router", false, 0),
+    IceInternal::Property("IceLocatorDiscovery.Locator.Router.CollocationOptimized", false, 0),
+    IceInternal::Property("IceLocatorDiscovery.Locator.Router.Context.*", false, 0),
+    IceInternal::Property("IceLocatorDiscovery.Locator.Router", false, 0),
+    IceInternal::Property("IceLocatorDiscovery.Locator.ProxyOptions", false, 0),
+    IceInternal::Property("IceLocatorDiscovery.Locator.ThreadPool.Size", false, 0),
+    IceInternal::Property("IceLocatorDiscovery.Locator.ThreadPool.SizeMax", false, 0),
+    IceInternal::Property("IceLocatorDiscovery.Locator.ThreadPool.SizeWarn", false, 0),
+    IceInternal::Property("IceLocatorDiscovery.Locator.ThreadPool.StackSize", false, 0),
+    IceInternal::Property("IceLocatorDiscovery.Locator.ThreadPool.Serialize", false, 0),
+    IceInternal::Property("IceLocatorDiscovery.Locator.ThreadPool.ThreadIdleTime", false, 0),
+    IceInternal::Property("IceLocatorDiscovery.Locator.ThreadPool.ThreadPriority", false, 0),
+    IceInternal::Property("IceLocatorDiscovery.Locator.MessageSizeMax", false, 0),
+    IceInternal::Property("IceLocatorDiscovery.Lookup", false, 0),
+    IceInternal::Property("IceLocatorDiscovery.Timeout", false, 0),
+    IceInternal::Property("IceLocatorDiscovery.RetryCount", false, 0),
+    IceInternal::Property("IceLocatorDiscovery.RetryDelay", false, 0),
+    IceInternal::Property("IceLocatorDiscovery.Address", false, 0),
+    IceInternal::Property("IceLocatorDiscovery.Port", false, 0),
+    IceInternal::Property("IceLocatorDiscovery.Interface", false, 0),
+    IceInternal::Property("IceLocatorDiscovery.InstanceName", false, 0),
 };
 
 const IceInternal::PropertyArray
-    IceInternal::PropertyNames::IceGridDiscoveryProps(IceGridDiscoveryPropsData,
-                                                sizeof(IceGridDiscoveryPropsData)/sizeof(IceGridDiscoveryPropsData[0]));
+    IceInternal::PropertyNames::IceLocatorDiscoveryProps(IceLocatorDiscoveryPropsData,
+                                                sizeof(IceLocatorDiscoveryPropsData)/sizeof(IceLocatorDiscoveryPropsData[0]));
 
 const IceInternal::Property IceBoxPropsData[] = 
 {
@@ -1262,7 +1262,7 @@ const IceInternal::PropertyArray IceInternal::PropertyNames::validProps[] =
     IceProps,
     IceMXProps,
     IceDiscoveryProps,
-    IceGridDiscoveryProps,
+    IceLocatorDiscoveryProps,
     IceBoxProps,
     IceBoxAdminProps,
     IceGridAdminProps,
@@ -1284,7 +1284,7 @@ const char* IceInternal::PropertyNames::clPropNames[] =
     "Ice",
     "IceMX",
     "IceDiscovery",
-    "IceGridDiscovery",
+    "IceLocatorDiscovery",
     "IceBox",
     "IceBoxAdmin",
     "IceGridAdmin",
diff --git a/cpp/src/Ice/PropertyNames.h b/cpp/src/Ice/PropertyNames.h
index e9c85a1e59f..c505e5aaeb5 100644
--- a/cpp/src/Ice/PropertyNames.h
+++ b/cpp/src/Ice/PropertyNames.h
@@ -6,7 +6,7 @@
 // ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
-// Generated by makeprops.py from file ../config/PropertyNames.xml, Tue Oct 18 11:38:00 2016
+// Generated by makeprops.py from file ./config/PropertyNames.xml, Wed Nov 16 09:52:45 2016
 
 // IMPORTANT: Do not edit this file -- any edits made here will be lost!
 
@@ -59,7 +59,7 @@ public:
     static const PropertyArray IceProps;
     static const PropertyArray IceMXProps;
     static const PropertyArray IceDiscoveryProps;
-    static const PropertyArray IceGridDiscoveryProps;
+    static const PropertyArray IceLocatorDiscoveryProps;
     static const PropertyArray IceBoxProps;
     static const PropertyArray IceBoxAdminProps;
     static const PropertyArray IceGridAdminProps;
diff --git a/cpp/src/IceGrid/IceGridNode.cpp b/cpp/src/IceGrid/IceGridNode.cpp
index 463effd1e98..de7d308702e 100644
--- a/cpp/src/IceGrid/IceGridNode.cpp
+++ b/cpp/src/IceGrid/IceGridNode.cpp
@@ -452,7 +452,7 @@ NodeService::startImpl(int argc, char* argv[], int& status)
     string instanceName = properties->getProperty("IceGrid.InstanceName");
     if(instanceName.empty())
     {
-        instanceName = properties->getProperty("IceGridDiscovery.InstanceName");
+        instanceName = properties->getProperty("IceLocatorDiscovery.InstanceName");
     }
     if(instanceName.empty())
     {
diff --git a/cpp/src/IceGrid/ServerI.cpp b/cpp/src/IceGrid/ServerI.cpp
index 7102acf6e28..891241ebe2f 100644
--- a/cpp/src/IceGrid/ServerI.cpp
+++ b/cpp/src/IceGrid/ServerI.cpp
@@ -328,15 +328,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";
             }