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/ProxyFactory.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/ProxyFactory.java')
| -rw-r--r-- | java/src/IceInternal/ProxyFactory.java | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/java/src/IceInternal/ProxyFactory.java b/java/src/IceInternal/ProxyFactory.java index c3fba4c0a88..6283de1dc0e 100644 --- a/java/src/IceInternal/ProxyFactory.java +++ b/java/src/IceInternal/ProxyFactory.java @@ -70,7 +70,7 @@ public final class ProxyFactory if(ref != null) { Ice.ObjectPrxHelperBase proxy = new Ice.ObjectPrxHelperBase(); - proxy.setup(ref); + proxy.__setup(ref); return proxy; } else @@ -248,23 +248,7 @@ public final class ProxyFactory logger.trace(traceLevels.retryCat, s); } - if(sleepInterval != null) - { - sleepInterval.value = interval; - } - else if(interval > 0) - { - // - // Sleep before retrying. - // - try - { - Thread.sleep(interval); - } - catch(InterruptedException ex1) - { - } - } + sleepInterval.value = interval; return cnt; } |