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/BatchOutgoingAsync.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/BatchOutgoingAsync.java')
| -rw-r--r-- | java/src/IceInternal/BatchOutgoingAsync.java | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/java/src/IceInternal/BatchOutgoingAsync.java b/java/src/IceInternal/BatchOutgoingAsync.java index 6153624c88e..ad289e019fb 100644 --- a/java/src/IceInternal/BatchOutgoingAsync.java +++ b/java/src/IceInternal/BatchOutgoingAsync.java @@ -35,10 +35,10 @@ public class BatchOutgoingAsync extends Ice.AsyncResult implements OutgoingAsync { _state |= Done | OK | Sent; //_os.resize(0, false); // Don't clear the buffer now, it's needed for the collocation optimization - if(_remoteObserver != null) + if(_childObserver != null) { - _remoteObserver.detach(); - _remoteObserver = null; + _childObserver.detach(); + _childObserver = null; } if(_timeoutRequestHandler != null) { @@ -59,11 +59,11 @@ public class BatchOutgoingAsync extends Ice.AsyncResult implements OutgoingAsync public void __finished(Ice.Exception exc, boolean sent) { - 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) { |