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 /cpp/src/Ice/Reference.cpp | |
| 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 'cpp/src/Ice/Reference.cpp')
| -rw-r--r-- | cpp/src/Ice/Reference.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cpp/src/Ice/Reference.cpp b/cpp/src/Ice/Reference.cpp index 4491a5bd0d1..464820b4ed1 100644 --- a/cpp/src/Ice/Reference.cpp +++ b/cpp/src/Ice/Reference.cpp @@ -1647,7 +1647,7 @@ IceInternal::RoutableReference::createConnection(const vector<EndpointIPtr>& all // (if any) to the new connection, so that callbacks from the // router can be received over this new connection. // - if(_routerInfo) + if(_routerInfo && _routerInfo->getAdapter()) { connection->setAdapter(_routerInfo->getAdapter()); } @@ -1684,7 +1684,7 @@ IceInternal::RoutableReference::createConnection(const vector<EndpointIPtr>& all // (if any) to the new connection, so that callbacks from the // router can be received over this new connection. // - if(_routerInfo) + if(_routerInfo && _routerInfo->getAdapter()) { connection->setAdapter(_routerInfo->getAdapter()); } @@ -1729,7 +1729,7 @@ IceInternal::RoutableReference::createConnection(const vector<EndpointIPtr>& all // (if any) to the new connection, so that callbacks from the // router can be received over this new connection. // - if(_reference->getRouterInfo()) + if(_reference->getRouterInfo() && _reference->getRouterInfo()->getAdapter()) { connection->setAdapter(_reference->getRouterInfo()->getAdapter()); } |