diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2008-03-14 18:47:45 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2008-03-14 18:47:45 +0100 |
| commit | 1ec8426013773ceb6b649137b7016793065d6c44 (patch) | |
| tree | bcdf2e9f0bd4eba61e08aebd61e5801e4fdf04dd /java/src/IceInternal/RoutableReference.java | |
| parent | Bug 2787 (diff) | |
| download | ice-1ec8426013773ceb6b649137b7016793065d6c44.tar.bz2 ice-1ec8426013773ceb6b649137b7016793065d6c44.tar.xz ice-1ec8426013773ceb6b649137b7016793065d6c44.zip | |
Fixed bug 2684 + collocation optimization bug
Diffstat (limited to 'java/src/IceInternal/RoutableReference.java')
| -rw-r--r-- | java/src/IceInternal/RoutableReference.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/java/src/IceInternal/RoutableReference.java b/java/src/IceInternal/RoutableReference.java index a16fffe72c6..8113eea9dae 100644 --- a/java/src/IceInternal/RoutableReference.java +++ b/java/src/IceInternal/RoutableReference.java @@ -817,7 +817,7 @@ public class RoutableReference extends Reference // (if any) to the new connection, so that callbacks from the // router can be received over this new connection. // - if(_routerInfo != null) + if(_routerInfo != null && _routerInfo.getAdapter() != null) { connection.setAdapter(_routerInfo.getAdapter()); } @@ -856,7 +856,7 @@ public class RoutableReference extends Reference // (if any) to the new connection, so that callbacks from the // router can be received over this new connection. // - if(_routerInfo != null) + if(_routerInfo != null && _routerInfo.getAdapter() != null) { connection.setAdapter(_routerInfo.getAdapter()); } @@ -891,7 +891,7 @@ public class RoutableReference extends Reference // (if any) to the new connection, so that callbacks from the // router can be received over this new connection. // - if(_routerInfo != null) + if(_routerInfo != null && _routerInfo.getAdapter() != null) { connection.setAdapter(_routerInfo.getAdapter()); } |