diff options
-rw-r--r-- | java/src/Ice/ObjectAdapterI.java | 4 | ||||
-rw-r--r-- | java/src/IceInternal/LocatorInfo.java | 9 |
2 files changed, 11 insertions, 2 deletions
diff --git a/java/src/Ice/ObjectAdapterI.java b/java/src/Ice/ObjectAdapterI.java index d2733c327b3..00660d52ed7 100644 --- a/java/src/Ice/ObjectAdapterI.java +++ b/java/src/Ice/ObjectAdapterI.java @@ -63,13 +63,13 @@ public class ObjectAdapterI extends LocalObjectImpl implements ObjectAdapter { _locatorInfo.getLocatorRegistry().setAdapterDirectProxy(_id, newDirectProxy(ident)); } - catch(Ice.AdapterNotRegistered ex) + catch(Ice.AdapterNotRegisteredException ex) { ObjectAdapterNotRegisteredException ex1 = new ObjectAdapterNotRegisteredException(); ex1.name = _name; throw ex1; } - catch(Ice.AdapterAlreadyActive ex) + catch(Ice.AdapterAlreadyActiveException ex) { ObjectAdapterIdInUseException ex1 = new ObjectAdapterIdInUseException(); ex1.name = _name; diff --git a/java/src/IceInternal/LocatorInfo.java b/java/src/IceInternal/LocatorInfo.java index 9cb484a8502..09e79609897 100644 --- a/java/src/IceInternal/LocatorInfo.java +++ b/java/src/IceInternal/LocatorInfo.java @@ -92,6 +92,15 @@ public final class LocatorInfo endpoints = ((Ice.ObjectPrxHelper)object).__reference().endpoints; } } + catch(Ice.AdapterNotRegisteredException ex) + { + if(ref.instance.traceLevels().location >= 1) + { + StringBuffer s = new StringBuffer(); + s.append("adapter `" + ref.adapterId + "' is not registered"); + ref.instance.logger().trace(ref.instance.traceLevels().locationCat, s.toString()); + } + } catch(Ice.LocalException ex) { // |