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 /java/src | |
| 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 'java/src')
| -rw-r--r-- | java/src/IceInternal/Reference.java | 70 |
1 files changed, 2 insertions, 68 deletions
diff --git a/java/src/IceInternal/Reference.java b/java/src/IceInternal/Reference.java index fe84090b4e6..8ceb32fa90d 100644 --- a/java/src/IceInternal/Reference.java +++ b/java/src/IceInternal/Reference.java @@ -360,41 +360,8 @@ public final class Reference newEndpoints[i] = endpoints[i].timeout(newTimeout); } - // - // If we have a router, we also change the timeout settings on the - // router and the router's client proxy. - // - RouterInfo newRouterInfo = null; - if(routerInfo != null) - { - try - { - Ice.RouterPrx newRouter = - Ice.RouterPrxHelper.uncheckedCast(routerInfo.getRouter().ice_timeout(newTimeout)); - Ice.ObjectPrx newClientProxy = routerInfo.getClientProxy().ice_timeout(newTimeout); - newRouterInfo = instance.routerManager().get(newRouter); - newRouterInfo.setClientProxy(newClientProxy); - } - catch(Ice.NoEndpointException ex) - { - // Ignore non-existing client proxies. - } - } - - // - // If we have a locator, we also change the timeout settings - // on the locator. - // - LocatorInfo newLocatorInfo = null; - if(locatorInfo != null) - { - Ice.LocatorPrx newLocator = - Ice.LocatorPrxHelper.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); } @@ -440,41 +407,8 @@ public final class Reference newEndpoints[i] = endpoints[i].compress(newCompress); } - // - // If we have a router, we also change the compress settings on the - // router and the router's client proxy. - // - RouterInfo newRouterInfo = null; - if(routerInfo != null) - { - try - { - Ice.RouterPrx newRouter = - Ice.RouterPrxHelper.uncheckedCast(routerInfo.getRouter().ice_compress(newCompress)); - Ice.ObjectPrx newClientProxy = routerInfo.getClientProxy().ice_compress(newCompress); - newRouterInfo = instance.routerManager().get(newRouter); - newRouterInfo.setClientProxy(newClientProxy); - } - catch(Ice.NoEndpointException ex) - { - // Ignore non-existing client proxies. - } - } - - // - // If we have a locator, we also change the compress settings - // on the locator. - // - LocatorInfo newLocatorInfo = null; - if(locatorInfo != null) - { - Ice.LocatorPrx newLocator = - Ice.LocatorPrxHelper.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); } |