diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2016-09-01 16:36:24 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2016-09-01 16:36:24 +0200 |
| commit | 0a000c7af772c14771d6907641e9afb4c79b7b9e (patch) | |
| tree | 60c8476a425b32fbf2bb300b03085e2b6f7274a2 | |
| parent | Fix typo in previous commit (diff) | |
| download | ice-0a000c7af772c14771d6907641e9afb4c79b7b9e.tar.bz2 ice-0a000c7af772c14771d6907641e9afb4c79b7b9e.tar.xz ice-0a000c7af772c14771d6907641e9afb4c79b7b9e.zip | |
Fixed servant locator cookie bug introduced with dispatch code changes
| -rw-r--r-- | java-compat/src/Ice/src/main/java/IceInternal/IncomingAsync.java | 4 | ||||
| -rw-r--r-- | java-compat/src/Ice/src/main/java/IceInternal/IncomingBase.java | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/IncomingAsync.java b/java-compat/src/Ice/src/main/java/IceInternal/IncomingAsync.java index 8ff27f1435e..b7d98689088 100644 --- a/java-compat/src/Ice/src/main/java/IceInternal/IncomingAsync.java +++ b/java-compat/src/Ice/src/main/java/IceInternal/IncomingAsync.java @@ -49,9 +49,11 @@ public class IncomingAsync extends IncomingBase implements Ice.AMDCallback { checkResponseSent(); - // Adopt observer + // Adopt observer and cookie in._observer = _observer; _observer = null; + in._cookie = _cookie; + _cookie = null; } final protected void diff --git a/java-compat/src/Ice/src/main/java/IceInternal/IncomingBase.java b/java-compat/src/Ice/src/main/java/IceInternal/IncomingBase.java index e66a124ba66..ffcc9ddfb71 100644 --- a/java-compat/src/Ice/src/main/java/IceInternal/IncomingBase.java +++ b/java-compat/src/Ice/src/main/java/IceInternal/IncomingBase.java @@ -39,15 +39,16 @@ class IncomingBase _instance = other._instance; _servant = other._servant; _locator = other._locator; - _cookie = other._cookie; _response = other._response; _compress = other._compress; _format = other._format; _responseHandler = other._responseHandler; - // Adopt observer + // Adopt observer and cookie _observer = other._observer; other._observer = null; + _cookie = other._cookie; + other._cookie = null; // // Deep copy |