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

1 files changed, 22 insertions, 15 deletions

diff --git a/java/src/IceBox/ServiceManagerI.java b/java/src/IceBox/ServiceManagerI.java
index 000e08bba92..d63bb237763 100644
--- a/java/src/IceBox/ServiceManagerI.java
+++ b/java/src/IceBox/ServiceManagerI.java
@@ -123,19 +123,23 @@ public class ServiceManagerI extends _ServiceManagerDisp
     {
         try
         {
+            Ice.Properties properties = _server.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.
             //
-            Ice.ObjectAdapter adapter = _server.communicator().createObjectAdapter("IceBox.ServiceManager");
-
-            Ice.Properties properties = _server.communicator().getProperties();
+            Ice.ObjectAdapter adapter = null;
+            if(!properties.getProperty("IceBox.ServiceManager.Endpoints").equals(""))
+            {
+                adapter = _server.communicator().createObjectAdapter("IceBox.ServiceManager");
 
-            Ice.Identity identity = new Ice.Identity();
-            identity.category = properties.getPropertyWithDefault("IceBox.InstanceName", "IceBox");
-            identity.name = "ServiceManager";
-            adapter.add(this, identity);
+                Ice.Identity identity = new Ice.Identity();
+                identity.category = properties.getPropertyWithDefault("IceBox.InstanceName", "IceBox");
+                identity.name = "ServiceManager";
+                adapter.add(this, identity);
+            }
 
             //
             // Parse the IceBox.LoadOrder property.
@@ -216,15 +220,18 @@ public class ServiceManagerI extends _ServiceManagerDisp
             //
             // Start request dispatching after we've started the services.
             //
-            try
-            {
-                adapter.activate();
-            }
-            catch(Ice.ObjectAdapterDeactivatedException ex)
+            if(adapter != null)
             {
-                //
-                // Expected if the communicator has been shutdown.
-                //
+                try
+                {
+                    adapter.activate();
+                }
+                catch(Ice.ObjectAdapterDeactivatedException ex)
+                {
+                    //
+                    // Expected if the communicator has been shutdown.
+                    //
+                }
             }
 
             _server.communicator().waitForShutdown();