diff options
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/Ice/ConnectionI.java | 7 | ||||
| -rw-r--r-- | java/src/Ice/RoutingTable.java | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/java/src/Ice/ConnectionI.java b/java/src/Ice/ConnectionI.java index 800acb80d23..9a7c0126e28 100644 --- a/java/src/Ice/ConnectionI.java +++ b/java/src/Ice/ConnectionI.java @@ -1005,6 +1005,13 @@ public final class ConnectionI extends IceInternal.EventHandler implements Conne public synchronized void setAdapter(ObjectAdapter adapter) { + if(_exception != null) + { + throw _exception; + } + + assert(_state < StateClosing); + // // Before we set an adapter (or reset it) we wait until the // dispatch count with any old adapter is zero. diff --git a/java/src/Ice/RoutingTable.java b/java/src/Ice/RoutingTable.java index 59a6eaf975e..2a1939c516d 100644 --- a/java/src/Ice/RoutingTable.java +++ b/java/src/Ice/RoutingTable.java @@ -36,7 +36,7 @@ public final class RoutingTable return false; } - ObjectPrx proxy = prx.ice_default(); // We insert the proxy in it's default form into the routing table. + ObjectPrx proxy = prx.ice_default(); // We insert the proxy in its default form into the routing table. synchronized(this) { |