1 files changed, 12 insertions, 1 deletions
diff --git a/java/src/Ice/ObjectAdapterI.java b/java/src/Ice/ObjectAdapterI.java
index 2ff0d423591..f6e70b255aa 100644
--- a/java/src/Ice/ObjectAdapterI.java
+++ b/java/src/Ice/ObjectAdapterI.java
@@ -51,7 +51,18 @@ public class ObjectAdapterI implements ObjectAdapter
 		// activate operation instead of a non obvious network
 		// exception?
 		//
-		_locatorInfo.getLocatorRegistry().addAdapter(_name, newDirectProxy(ident));
+		try
+		{
+		    _locatorInfo.getLocatorRegistry().setAdapterDirectProxy(_name, newDirectProxy(ident));
+		}
+		catch(Ice.AdapterNotRegistered ex)
+		{
+		    throw new ObjectAdapterNotRegisteredException();
+		}
+		catch(Ice.AdapterAlreadyActive ex)
+		{
+		    throw new ObjectAdapterActiveException();
+		}
 	    }
 	}