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/Outgoing.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/Outgoing.java')
| -rw-r--r-- | java/src/IceInternal/Outgoing.java | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/java/src/IceInternal/Outgoing.java b/java/src/IceInternal/Outgoing.java index ac06172ce72..3a14e835110 100644 --- a/java/src/IceInternal/Outgoing.java +++ b/java/src/IceInternal/Outgoing.java @@ -9,7 +9,7 @@ package IceInternal; -import Ice.Instrumentation.RemoteObserver; +import Ice.Instrumentation.ChildInvocationObserver; import Ice.Instrumentation.InvocationObserver; public final class Outgoing implements OutgoingMessageCallback @@ -255,10 +255,10 @@ public final class Outgoing implements OutgoingMessageCallback { if(_proxy.__reference().getMode() != Reference.ModeTwoway) { - if(_remoteObserver != null) + if(_childObserver != null) { - _remoteObserver.detach(); - _remoteObserver = null; + _childObserver.detach(); + _childObserver = null; } _state = StateOK; } @@ -273,11 +273,11 @@ public final class Outgoing implements OutgoingMessageCallback assert(_state <= StateInProgress); - 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(_is == null) @@ -418,11 +418,11 @@ public final class Outgoing implements OutgoingMessageCallback finished(Ice.Exception ex, boolean sent) { assert(_state <= StateInProgress); - if(_remoteObserver != null) + if(_childObserver != null) { - _remoteObserver.failed(ex.ice_name()); - _remoteObserver.detach(); - _remoteObserver = null; + _childObserver.failed(ex.ice_name()); + _childObserver.detach(); + _childObserver = null; } _state = StateFailed; _exception = ex; @@ -520,23 +520,23 @@ public final class Outgoing implements OutgoingMessageCallback { if(_observer != null) { - _remoteObserver = _observer.getRemoteObserver(info, endpt, requestId, size); - if(_remoteObserver != null) + _childObserver = _observer.getRemoteObserver(info, endpt, requestId, size); + if(_childObserver != null) { - _remoteObserver.attach(); + _childObserver.attach(); } } } public void - attachCollocatedObserver(int requestId) + 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(); } } } @@ -659,7 +659,7 @@ public final class Outgoing implements OutgoingMessageCallback private int _state; private InvocationObserver _observer; - private RemoteObserver _remoteObserver; + private ChildInvocationObserver _childObserver; public Outgoing next; // For use by Ice.ObjectPrxHelperBase |