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/BatchOutgoing.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/BatchOutgoing.java')
| -rw-r--r-- | java/src/IceInternal/BatchOutgoing.java | 31 |
1 files changed, 16 insertions, 15 deletions
diff --git a/java/src/IceInternal/BatchOutgoing.java b/java/src/IceInternal/BatchOutgoing.java index b60e29268aa..8647e89ccde 100644 --- a/java/src/IceInternal/BatchOutgoing.java +++ b/java/src/IceInternal/BatchOutgoing.java @@ -172,10 +172,10 @@ public final class BatchOutgoing implements OutgoingMessageCallback synchronized public void sent() { - if(_remoteObserver != null) + if(_childObserver != null) { - _remoteObserver.detach(); - _remoteObserver = null; + _childObserver.detach(); + _childObserver = null; } _sent = true; notify(); @@ -184,11 +184,11 @@ public final class BatchOutgoing implements OutgoingMessageCallback public synchronized void finished(Ice.Exception ex, boolean sent) { - if(_remoteObserver != null) + if(_childObserver != null) { - _remoteObserver.failed(ex.ice_name()); - _remoteObserver.detach(); - _remoteObserver = null; + _childObserver.failed(ex.ice_name()); + _childObserver.detach(); + _childObserver = null; } _exception = ex; notify(); @@ -205,22 +205,23 @@ public final class BatchOutgoing implements OutgoingMessageCallback { if(_observer != null) { - _remoteObserver = _observer.getRemoteObserver(info, endpt, 0, size); - if(_remoteObserver != null) + _childObserver = _observer.getRemoteObserver(info, endpt, 0, size); + if(_childObserver != null) { - _remoteObserver.attach(); + _childObserver.attach(); } } } - public void attachCollocatedObserver(int requestId) + public void + attachCollocatedObserver(Ice.ObjectAdapter adapter, int requestId) { if(_observer != null) { - _remoteObserver = _observer.getCollocatedObserver(requestId, _os.size() - Protocol.headerSize - 4); - if(_remoteObserver != null) + _childObserver = _observer.getCollocatedObserver(adapter, requestId, _os.size() - Protocol.headerSize - 4); + if(_childObserver != null) { - _remoteObserver.attach(); + _childObserver.attach(); } } } @@ -232,6 +233,6 @@ public final class BatchOutgoing implements OutgoingMessageCallback private Ice.Exception _exception; private InvocationObserver _observer; - private Observer _remoteObserver; + private Observer _childObserver; } |