diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2013-09-09 19:12:28 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2013-09-09 19:12:28 +0200 |
| commit | 8a0d1c7e34d8bd18bd85666cce94403a5158975c (patch) | |
| tree | 36050a818282c0a92ee88a6ef28354e186c5aebe /java/src/Ice/ConnectionI.java | |
| parent | Test scripts improvements (diff) | |
| download | ice-8a0d1c7e34d8bd18bd85666cce94403a5158975c.tar.bz2 ice-8a0d1c7e34d8bd18bd85666cce94403a5158975c.tar.xz ice-8a0d1c7e34d8bd18bd85666cce94403a5158975c.zip | |
Fixed ICE-5196: allow setting an observer with IceMX enabled
Diffstat (limited to 'java/src/Ice/ConnectionI.java')
| -rw-r--r-- | java/src/Ice/ConnectionI.java | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/java/src/Ice/ConnectionI.java b/java/src/Ice/ConnectionI.java index 32bf6308d05..bdd49e86ab7 100644 --- a/java/src/Ice/ConnectionI.java +++ b/java/src/Ice/ConnectionI.java @@ -257,11 +257,11 @@ public final class ConnectionI extends IceInternal.EventHandler implements Conne return; } - assert(_instance.initializationData().observer != null); - _observer = _instance.initializationData().observer.getConnectionObserver(initConnectionInfo(), - _endpoint, - toConnectionState(_state), - _observer); + assert(_instance.getObserver() != null); + _observer = _instance.getObserver().getConnectionObserver(initConnectionInfo(), + _endpoint, + toConnectionState(_state), + _observer); if(_observer != null) { _observer.attach(); @@ -1831,16 +1831,16 @@ public final class ConnectionI extends IceInternal.EventHandler implements Conne } } - if(_instance.initializationData().observer != null) + if(_instance.getObserver() != null) { Ice.Instrumentation.ConnectionState oldState = toConnectionState(_state); Ice.Instrumentation.ConnectionState newState = toConnectionState(state); if(oldState != newState) { - _observer = _instance.initializationData().observer.getConnectionObserver(initConnectionInfo(), - _endpoint, - newState, - _observer); + _observer = _instance.getObserver().getConnectionObserver(initConnectionInfo(), + _endpoint, + newState, + _observer); if(_observer != null) { _observer.attach(); |