diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2014-06-27 10:31:41 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2014-06-27 10:31:41 +0200 |
| commit | a4f93259dc3494d98addf38e69b87eb557d432b3 (patch) | |
| tree | d2b78bb5cea24e33dc1b46be22dba6167e96c9ed /java/src/IceInternal/RouterInfo.java | |
| parent | Fix for ICE-5515 (ice_staticId on proxies) in Java, C#, Python, Ruby and PHP ... (diff) | |
| download | ice-a4f93259dc3494d98addf38e69b87eb557d432b3.tar.bz2 ice-a4f93259dc3494d98addf38e69b87eb557d432b3.tar.xz ice-a4f93259dc3494d98addf38e69b87eb557d432b3.zip | |
Better collocation optimization, fix for ICE-5489, ICE-5484
Diffstat (limited to 'java/src/IceInternal/RouterInfo.java')
| -rw-r--r-- | java/src/IceInternal/RouterInfo.java | 39 |
1 files changed, 3 insertions, 36 deletions
diff --git a/java/src/IceInternal/RouterInfo.java b/java/src/IceInternal/RouterInfo.java index 1630cb92819..84856f1294f 100644 --- a/java/src/IceInternal/RouterInfo.java +++ b/java/src/IceInternal/RouterInfo.java @@ -110,21 +110,7 @@ public final class RouterInfo public void exception(Ice.LocalException ex) { - if(ex instanceof Ice.CollocationOptimizationException) - { - try - { - callback.setEndpoints(getClientEndpoints()); - } - catch(Ice.LocalException e) - { - callback.setException(e); - } - } - else - { - callback.setException(ex); - } + callback.setException(ex); } }); } @@ -189,22 +175,7 @@ public final class RouterInfo public void exception(Ice.LocalException ex) { - if(ex instanceof Ice.CollocationOptimizationException) - { - try - { - addProxy(proxy); - callback.addedProxy(); - } - catch(Ice.LocalException e) - { - callback.setException(ex); - } - } - else - { - callback.setException(ex); - } + callback.setException(ex); } }); @@ -249,14 +220,10 @@ public final class RouterInfo // router, we must use the same timeout as the already // existing connection. // - try + if(_router.ice_getConnection() != null) { clientProxy = clientProxy.ice_timeout(_router.ice_getConnection().timeout()); } - catch(Ice.CollocationOptimizationException ex) - { - // Ignore - collocated router. - } _clientEndpoints = ((Ice.ObjectPrxHelperBase)clientProxy).__reference().getEndpoints(); } |