diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2014-09-29 11:17:22 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2014-09-29 11:17:22 +0200 |
| commit | db3585813845bdd17d9ee3c7d5a4828a82e03f4b (patch) | |
| tree | 660c77fde31f6656a2b76720df4f75b7eb1adbf4 /java/src/Ice/ObjectPrxHelperBase.java | |
| parent | - begin_ now never interrupts. (diff) | |
| download | ice-db3585813845bdd17d9ee3c7d5a4828a82e03f4b.tar.bz2 ice-db3585813845bdd17d9ee3c7d5a4828a82e03f4b.tar.xz ice-db3585813845bdd17d9ee3c7d5a4828a82e03f4b.zip | |
Improved fix for ICE-5693 and update of request handler
Diffstat (limited to 'java/src/Ice/ObjectPrxHelperBase.java')
| -rw-r--r-- | java/src/Ice/ObjectPrxHelperBase.java | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/java/src/Ice/ObjectPrxHelperBase.java b/java/src/Ice/ObjectPrxHelperBase.java index 031a2608466..00f7b9a30de 100644 --- a/java/src/Ice/ObjectPrxHelperBase.java +++ b/java/src/Ice/ObjectPrxHelperBase.java @@ -2783,15 +2783,11 @@ public class ObjectPrxHelperBase implements ObjectPrx, java.io.Serializable public void __setRequestHandler(IceInternal.RequestHandler previous, IceInternal.RequestHandler handler) { - if(_reference.getCacheConnection()) + if(_reference.getCacheConnection() && previous != null) { synchronized(this) { - if(_requestHandler == null) - { - _requestHandler = handler; - } - else if(_requestHandler != handler) + if(_requestHandler != null && _requestHandler != handler) { // // Update the request handler only if "previous" is the same |