bug 2441 - Do not require IceBoc.ServiceManager.Endpoints to be set

1 files changed, 21 insertions, 14 deletions

diff --git a/cpp/src/IceBox/ServiceManagerI.cpp b/cpp/src/IceBox/ServiceManagerI.cpp
index 7664b0890ac..e75dd7fee26 100644
--- a/cpp/src/IceBox/ServiceManagerI.cpp
+++ b/cpp/src/IceBox/ServiceManagerI.cpp
@@ -141,19 +141,23 @@ IceBox::ServiceManagerI::start()
     try
     {
         ServiceManagerPtr obj = this;
+        PropertiesPtr properties = _communicator->getProperties();
 
         //
         // Create an object adapter. Services probably should NOT share
         // this object adapter, as the endpoint(s) for this object adapter
         // will most likely need to be firewalled for security reasons.
         //
-        ObjectAdapterPtr adapter = _communicator->createObjectAdapter("IceBox.ServiceManager");
+        ObjectAdapterPtr adapter;
+        if(properties->getProperty("IceBox.ServiceManager.Endpoints") != "")
+        {
+            adapter = _communicator->createObjectAdapter("IceBox.ServiceManager");
 
-        PropertiesPtr properties = _communicator->getProperties();
-        Identity identity;
-        identity.category = properties->getPropertyWithDefault("IceBox.InstanceName", "IceBox");
-        identity.name = "ServiceManager";
-        adapter->add(obj, identity);
+            Identity identity;
+            identity.category = properties->getPropertyWithDefault("IceBox.InstanceName", "IceBox");
+            identity.name = "ServiceManager";
+            adapter->add(obj, identity);
+        }
 
         //
         // Parse the IceBox.LoadOrder property.
@@ -228,15 +232,18 @@ IceBox::ServiceManagerI::start()
             cout << bundleName << " ready" << endl;
         }
 
-        try
-        {
-            adapter->activate();
-        }
-        catch(const ObjectAdapterDeactivatedException&)
+        if(adapter)
         {
-            //
-            // Expected if the communicator has been shutdown.
-            //
+            try
+            {
+                adapter->activate();
+            }
+            catch(const ObjectAdapterDeactivatedException&)
+            {
+                //
+                // Expected if the communicator has been shutdown.
+                //
+            }
         }
     }
     catch(const FailureException& ex)