1 files changed, 2 insertions, 13 deletions
diff --git a/java/src/Ice/CommunicatorI.java b/java/src/Ice/CommunicatorI.java
index d8d3c1c20a5..fddeecf9588 100644
--- a/java/src/Ice/CommunicatorI.java
+++ b/java/src/Ice/CommunicatorI.java
@@ -44,24 +44,13 @@ public final class CommunicatorI extends LocalObjectImpl implements Communicator
     public ObjectAdapter
     createObjectAdapter(String name)
     {
-	return _instance.objectAdapterFactory().createObjectAdapter(name);
+	return createObjectAdapterWithEndpoints(name, getProperties().getProperty(name + ".Endpoints"));
     }
 
     public ObjectAdapter
     createObjectAdapterWithEndpoints(String name, String endpoints)
     {
-	final String propertyKey = new String(name + ".Endpoints");
-	final String originalValue = getProperties().getProperty(propertyKey);
-	try
-	{
-	    getProperties().setProperty(propertyKey, endpoints);
-	    return createObjectAdapter(name);
-	}
-	catch(AlreadyRegisteredException ex)
-	{
-	    getProperties().setProperty(propertyKey, originalValue);
-	    throw ex;
-	}
+	return _instance.objectAdapterFactory().createObjectAdapter(name, endpoints);
     }
 
     public void