diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2014-07-01 17:42:04 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2014-07-01 17:42:04 +0200 |
| commit | 344a7fd6e0d716f81dc27495e97a7ad9c2ab07b8 (patch) | |
| tree | bd06f4919e5a5827f60e2a536e43e47a4fbed6d2 /java/src/IceInternal/OutgoingAsync.java | |
| parent | Fixed ICE-5569: IceStorm IceMX debug iterator assert (diff) | |
| download | ice-344a7fd6e0d716f81dc27495e97a7ad9c2ab07b8.tar.bz2 ice-344a7fd6e0d716f81dc27495e97a7ad9c2ab07b8.tar.xz ice-344a7fd6e0d716f81dc27495e97a7ad9c2ab07b8.zip | |
IceMX and Python support for the new collocation optimization
Diffstat (limited to 'java/src/IceInternal/OutgoingAsync.java')
| -rw-r--r-- | java/src/IceInternal/OutgoingAsync.java | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/java/src/IceInternal/OutgoingAsync.java b/java/src/IceInternal/OutgoingAsync.java index 41c56076a94..9d18c397d6a 100644 --- a/java/src/IceInternal/OutgoingAsync.java +++ b/java/src/IceInternal/OutgoingAsync.java @@ -124,10 +124,10 @@ public class OutgoingAsync extends Ice.AsyncResult implements OutgoingAsyncMessa if(!_proxy.ice_isTwoway()) { - if(_remoteObserver != null) + if(_childObserver != null) { - _remoteObserver.detach(); - _remoteObserver = null; + _childObserver.detach(); + _childObserver = null; } if(_timeoutRequestHandler != null) { @@ -154,11 +154,11 @@ public class OutgoingAsync extends Ice.AsyncResult implements OutgoingAsyncMessa synchronized(_monitor) { assert((_state & Done) == 0); - if(_remoteObserver != null) + if(_childObserver != null) { - _remoteObserver.failed(exc.ice_name()); - _remoteObserver.detach(); - _remoteObserver = null; + _childObserver.failed(exc.ice_name()); + _childObserver.detach(); + _childObserver = null; } if(_timeoutRequestHandler != null) { @@ -197,11 +197,11 @@ public class OutgoingAsync extends Ice.AsyncResult implements OutgoingAsyncMessa synchronized(_monitor) { assert(_exception == null && (_state & Done) == 0); - if(_remoteObserver != null) + if(_childObserver != null) { - _remoteObserver.reply(is.size() - Protocol.headerSize - 4); - _remoteObserver.detach(); - _remoteObserver = null; + _childObserver.reply(is.size() - Protocol.headerSize - 4); + _childObserver.detach(); + _childObserver = null; } if(_timeoutRequestHandler != null) |