diff options
| author | Dwayne Boone <dwayne@zeroc.com> | 2007-01-03 18:08:31 +0000 |
|---|---|---|
| committer | Dwayne Boone <dwayne@zeroc.com> | 2007-01-03 18:08:31 +0000 |
| commit | ae899e981811eec7ad4ee2c7bf354174cf7dfeaf (patch) | |
| tree | 8606155063f77cf50d0d28e335c544bd776b603a /cpp/src/Ice/ObjectAdapterI.cpp | |
| parent | Added -bind_at_load, without this we get various crashes in the linker (diff) | |
| download | ice-ae899e981811eec7ad4ee2c7bf354174cf7dfeaf.tar.bz2 ice-ae899e981811eec7ad4ee2c7bf354174cf7dfeaf.tar.xz ice-ae899e981811eec7ad4ee2c7bf354174cf7dfeaf.zip | |
Bug 1327 - allow getClientProxy to return nil proxy
Diffstat (limited to 'cpp/src/Ice/ObjectAdapterI.cpp')
| -rw-r--r-- | cpp/src/Ice/ObjectAdapterI.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/cpp/src/Ice/ObjectAdapterI.cpp b/cpp/src/Ice/ObjectAdapterI.cpp index 954e3976ad5..774bb1a45cc 100644 --- a/cpp/src/Ice/ObjectAdapterI.cpp +++ b/cpp/src/Ice/ObjectAdapterI.cpp @@ -766,8 +766,7 @@ Ice::ObjectAdapterI::ObjectAdapterI(const InstancePtr& instance, const Communica // Add the router's server proxy endpoints to this object // adapter. // - ObjectPrx proxy = _routerInfo->getServerProxy(); - vector<EndpointIPtr> endpoints = proxy->__reference()->getEndpoints(); + vector<EndpointIPtr> endpoints = _routerInfo->getServerEndpoints(); copy(endpoints.begin(), endpoints.end(), back_inserter(_routerEndpoints)); sort(_routerEndpoints.begin(), _routerEndpoints.end()); // Must be sorted. _routerEndpoints.erase(unique(_routerEndpoints.begin(), _routerEndpoints.end()), |