diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2014-09-12 13:24:38 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2014-09-12 13:24:38 +0200 |
| commit | abeebf67ba35156606bbaabf073b496900f836cf (patch) | |
| tree | 430212c34a1a1d4922fa11426e9fbd537fb98e52 /java/src/Ice/ConnectionI.java | |
| parent | Fixed dependencies (diff) | |
| download | ice-abeebf67ba35156606bbaabf073b496900f836cf.tar.bz2 ice-abeebf67ba35156606bbaabf073b496900f836cf.tar.xz ice-abeebf67ba35156606bbaabf073b496900f836cf.zip | |
Fixed ICE-5620: metrics admin creation in IceBox, fixed bug where timer wasn't instrumented
Diffstat (limited to 'java/src/Ice/ConnectionI.java')
| -rw-r--r-- | java/src/Ice/ConnectionI.java | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/java/src/Ice/ConnectionI.java b/java/src/Ice/ConnectionI.java index 29a2bd5543c..cb3383bfb56 100644 --- a/java/src/Ice/ConnectionI.java +++ b/java/src/Ice/ConnectionI.java @@ -245,9 +245,11 @@ public final class ConnectionI extends IceInternal.EventHandler implements Conne return; } - assert (_instance.getObserver() != null); - _observer = _instance.getObserver().getConnectionObserver(initConnectionInfo(), _endpoint, - toConnectionState(_state), _observer); + assert (_instance.initializationData().observer != null); + _observer = _instance.initializationData().observer.getConnectionObserver(initConnectionInfo(), + _endpoint, + toConnectionState(_state), + _observer); if(_observer != null) { _observer.attach(); @@ -1881,14 +1883,16 @@ public final class ConnectionI extends IceInternal.EventHandler implements Conne } } - if(_instance.getObserver() != null) + if(_instance.initializationData().observer != null) { Ice.Instrumentation.ConnectionState oldState = toConnectionState(_state); Ice.Instrumentation.ConnectionState newState = toConnectionState(state); if(oldState != newState) { - _observer = _instance.getObserver().getConnectionObserver(initConnectionInfo(), _endpoint, newState, - _observer); + _observer = _instance.initializationData().observer.getConnectionObserver(initConnectionInfo(), + _endpoint, + newState, + _observer); if(_observer != null) { _observer.attach(); |