diff options
| author | Marc Laukien <marc@zeroc.com> | 2004-10-22 20:24:08 +0000 |
|---|---|---|
| committer | Marc Laukien <marc@zeroc.com> | 2004-10-22 20:24:08 +0000 |
| commit | 580c562e7ae2e2b86cdf211325948e29fd1bde0b (patch) | |
| tree | ef3c2763490b659e2ea34204716b76c94edc377a /cpp/src/Ice/Reference.cpp | |
| parent | test for null in hashCode, equals (diff) | |
| download | ice-580c562e7ae2e2b86cdf211325948e29fd1bde0b.tar.bz2 ice-580c562e7ae2e2b86cdf211325948e29fd1bde0b.tar.xz ice-580c562e7ae2e2b86cdf211325948e29fd1bde0b.zip | |
fixed deadlock ; removed code that was wrong
Diffstat (limited to 'cpp/src/Ice/Reference.cpp')
| -rw-r--r-- | cpp/src/Ice/Reference.cpp | 66 |
1 files changed, 2 insertions, 64 deletions
diff --git a/cpp/src/Ice/Reference.cpp b/cpp/src/Ice/Reference.cpp index 5886762183d..8faf9e32e17 100644 --- a/cpp/src/Ice/Reference.cpp +++ b/cpp/src/Ice/Reference.cpp @@ -432,39 +432,8 @@ IceInternal::Reference::changeTimeout(int newTimeout) const newEndpoints.push_back((*p)->timeout(newTimeout)); } - // - // If we have a router, we also change the timeout settings on the - // router and the router's client proxy. - // - RouterInfoPtr newRouterInfo; - if(routerInfo) - { - try - { - RouterPrx newRouter = RouterPrx::uncheckedCast(routerInfo->getRouter()->ice_timeout(newTimeout)); - ObjectPrx newClientProxy = routerInfo->getClientProxy()->ice_timeout(newTimeout); - newRouterInfo = instance->routerManager()->get(newRouter); - newRouterInfo->setClientProxy(newClientProxy); - } - catch(const NoEndpointException&) - { - // Ignore non-existing client proxies. - } - } - - // - // If we have a locator, we also change the timeout settings on the - // locator. - // - LocatorInfoPtr newLocatorInfo; - if(locatorInfo) - { - LocatorPrx newLocator = LocatorPrx::uncheckedCast(locatorInfo->getLocator()->ice_timeout(newTimeout)); - newLocatorInfo = instance->locatorManager()->get(newLocator); - } - return instance->referenceFactory()->create(identity, context, facet, mode, secure, adapterId, - newEndpoints, newRouterInfo, newLocatorInfo, fixedConnections, + newEndpoints, routerInfo, locatorInfo, fixedConnections, collocationOptimization); } @@ -512,39 +481,8 @@ IceInternal::Reference::changeCompress(bool newCompress) const newEndpoints.push_back((*p)->compress(newCompress)); } - // - // If we have a router, we also change the compress settings on the - // router and the router's client proxy. - // - RouterInfoPtr newRouterInfo; - if(routerInfo) - { - try - { - RouterPrx newRouter = RouterPrx::uncheckedCast(routerInfo->getRouter()->ice_compress(newCompress)); - ObjectPrx newClientProxy = routerInfo->getClientProxy()->ice_compress(newCompress); - newRouterInfo = instance->routerManager()->get(newRouter); - newRouterInfo->setClientProxy(newClientProxy); - } - catch(const NoEndpointException&) - { - // Ignore non-existing client proxies. - } - } - - // - // If we have a locator, we also change the compress settings on the - // locator. - // - LocatorInfoPtr newLocatorInfo; - if(locatorInfo) - { - LocatorPrx newLocator = LocatorPrx::uncheckedCast(locatorInfo->getLocator()->ice_compress(newCompress)); - newLocatorInfo = instance->locatorManager()->get(newLocator); - } - return instance->referenceFactory()->create(identity, context, facet, mode, secure, adapterId, - newEndpoints, newRouterInfo, newLocatorInfo, fixedConnections, + newEndpoints, routerInfo, locatorInfo, fixedConnections, collocationOptimization); } |