Bug 1570 - object adapter configuration

2 files changed, 57 insertions, 14 deletions

diff --git a/java/src/Ice/ObjectAdapterI.java b/java/src/Ice/ObjectAdapterI.java
index 39d96ea0916..17ed667b8ab 100644
--- a/java/src/Ice/ObjectAdapterI.java
+++ b/java/src/Ice/ObjectAdapterI.java
@@ -17,7 +17,7 @@ public final class ObjectAdapterI extends LocalObjectImpl implements ObjectAdapt
 	//
         // No mutex lock necessary, _name is immutable.
 	//
-        return _name;
+        return _noConfig ? "" : _name;
     }
 
     public synchronized Communicator
@@ -66,9 +66,12 @@ public final class ObjectAdapterI extends LocalObjectImpl implements ObjectAdapt
 	    _waitForActivate = true;
 	    
 	    locatorInfo = _locatorInfo;
-	    final Properties properties = _instance.initializationData().properties;
-	    registerProcess = properties.getPropertyAsInt(_name +".RegisterProcess") > 0;
-	    printAdapterReady = properties.getPropertyAsInt("Ice.PrintAdapterReady") > 0;
+	    if(!_noConfig)
+	    {
+	        final Properties properties = _instance.initializationData().properties;
+	        registerProcess = properties.getPropertyAsInt(_name +".RegisterProcess") > 0;
+	        printAdapterReady = properties.getPropertyAsInt("Ice.PrintAdapterReady") > 0;
+	    }
 	}
 
 	try
@@ -683,7 +686,7 @@ public final class ObjectAdapterI extends LocalObjectImpl implements ObjectAdapt
     public
     ObjectAdapterI(IceInternal.Instance instance, Communicator communicator, 
     		   IceInternal.ObjectAdapterFactory objectAdapterFactory, String name, String endpointInfo,
-		   RouterPrx router)
+		   RouterPrx router, boolean noConfig)
     {
 	_deactivated = false;
         _instance = instance;
@@ -692,11 +695,34 @@ public final class ObjectAdapterI extends LocalObjectImpl implements ObjectAdapt
 	_servantManager = new IceInternal.ServantManager(instance, name);
 	_activateOneOffDone = false;
         _name = name;
-	_id = instance.initializationData().properties.getProperty(name + ".AdapterId");
-	_replicaGroupId = instance.initializationData().properties.getProperty(name + ".ReplicaGroupId");
 	_directCount = 0;
  	_waitForActivate = false;
 	_waitForDeactivate = false;
+	_noConfig = noConfig;
+
+	if(_noConfig)
+	{
+	    _id = "";
+	    _replicaGroupId = "";
+	    return;
+	}
+
+	//
+	// Make sure named adapter has some configuration.
+	//
+	if(endpointInfo.length() == 0 && router == null)
+	{
+	    java.util.Map oaProps = instance.initializationData().properties.getPropertiesForPrefix(_name + ".");
+	    if(oaProps.size() == 0)
+	    {
+	        InitializationException ex = new InitializationException();
+		ex.reason = "Object adapter \"" + _name + "\" requires configuration.";
+		throw ex;
+	    }
+	}
+
+	_id = instance.initializationData().properties.getProperty(name + ".AdapterId");
+	_replicaGroupId = instance.initializationData().properties.getProperty(name + ".ReplicaGroupId");
 	
         try
         {
@@ -855,7 +881,7 @@ public final class ObjectAdapterI extends LocalObjectImpl implements ObjectAdapt
 	    // For compatibility with C#, we do not invoke methods on other objects
 	    // in a finalizer.
 	    //
-            //_instance.initializationData().logger.warning("object adapter `" + _name + "' has not been deactivated");
+            //_instance.initializationData().logger.warning("object adapter `" + getName() + "' has not been deactivated");
         }
         else if(_instance != null)
         {
@@ -863,7 +889,7 @@ public final class ObjectAdapterI extends LocalObjectImpl implements ObjectAdapt
 	    // For compatibility with C#, we do not invoke methods on other objects
 	    // in a finalizer.
 	    //
-            //_instance.initializationData().logger.warning("object adapter `" + _name + "' deactivation had not been waited for");
+            //_instance.initializationData().logger.warning("object adapter `" + getName() + "' deactivation had not been waited for");
         }
 	else
 	{
@@ -952,7 +978,7 @@ public final class ObjectAdapterI extends LocalObjectImpl implements ObjectAdapt
 	if(_deactivated)
 	{
             ObjectAdapterDeactivatedException ex = new ObjectAdapterDeactivatedException();
-	    ex.name = _name;
+	    ex.name = getName();
 	    throw ex;
 	}
     }
@@ -1051,12 +1077,12 @@ public final class ObjectAdapterI extends LocalObjectImpl implements ObjectAdapt
 	    if(locatorRegistry == null)
 	    {
 		_instance.initializationData().logger.warning(
-		    "object adapter `" + _name + "' cannot register the process without a locator registry");
+		    "object adapter `" + getName() + "' cannot register the process without a locator registry");
 	    }
 	    else if(serverId.length() == 0)
 	    {
 		_instance.initializationData().logger.warning(
-		    "object adapter `" + _name + "' cannot register the process without a value for Ice.ServerId");
+		    "object adapter `" + getName() + "' cannot register the process without a value for Ice.ServerId");
 	    }
 	}
 
@@ -1170,4 +1196,5 @@ public final class ObjectAdapterI extends LocalObjectImpl implements ObjectAdapt
     private int _directCount;
     private boolean _waitForActivate;
     private boolean _waitForDeactivate;
+    private boolean _noConfig;
 }
diff --git a/java/src/IceInternal/ObjectAdapterFactory.java b/java/src/IceInternal/ObjectAdapterFactory.java
index 060201bbb68..f9dda51e09f 100644
--- a/java/src/IceInternal/ObjectAdapterFactory.java
+++ b/java/src/IceInternal/ObjectAdapterFactory.java
@@ -127,8 +127,24 @@ public final class ObjectAdapterFactory
 	    throw new Ice.AlreadyRegisteredException("object adapter", name);
         }
 
-        adapter = new Ice.ObjectAdapterI(_instance, _communicator, this, name, endpoints, router);
-        _adapters.put(name, adapter);
+	if(name.length() == 0 && (endpoints.length() != 0 || router != null))
+	{
+	    Ice.InitializationException ex = new Ice.InitializationException();
+	    ex.reason = "Cannot configure endpoints or router with nameless object adapter";
+	    throw ex;
+	}
+
+	if(name.length() == 0)
+	{
+	    String uuid = Ice.Util.generateUUID();
+            adapter = new Ice.ObjectAdapterI(_instance, _communicator, this, uuid, "", null, true);
+            _adapters.put(uuid, adapter);
+	}
+	else
+	{
+            adapter = new Ice.ObjectAdapterI(_instance, _communicator, this, name, endpoints, router, false);
+            _adapters.put(name, adapter);
+	}
         return adapter;
     }