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 /cpp/src/Ice/ConnectionI.cpp | |
| 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 'cpp/src/Ice/ConnectionI.cpp')
| -rw-r--r-- | cpp/src/Ice/ConnectionI.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/cpp/src/Ice/ConnectionI.cpp b/cpp/src/Ice/ConnectionI.cpp index 8091d2f2233..fbf9b2ea5f6 100644 --- a/cpp/src/Ice/ConnectionI.cpp +++ b/cpp/src/Ice/ConnectionI.cpp @@ -525,11 +525,11 @@ Ice::ConnectionI::updateObserver() return; } - assert(_instance->initializationData().observer); - _observer.attach(_instance->initializationData().observer->getConnectionObserver(initConnectionInfo(), - _endpoint, - toConnectionState(_state), - _observer.get())); + assert(_instance->getObserver()); + _observer.attach(_instance->getObserver()->getConnectionObserver(initConnectionInfo(), + _endpoint, + toConnectionState(_state), + _observer.get())); } void @@ -2188,16 +2188,16 @@ Ice::ConnectionI::setState(State state) } } - if(_instance->initializationData().observer) + if(_instance->getObserver()) { ConnectionState oldState = toConnectionState(_state); ConnectionState newState = toConnectionState(state); if(oldState != newState) { - _observer.attach(_instance->initializationData().observer->getConnectionObserver(initConnectionInfo(), - _endpoint, - newState, - _observer.get())); + _observer.attach(_instance->getObserver()->getConnectionObserver(initConnectionInfo(), + _endpoint, + newState, + _observer.get())); } if(_observer && state == StateClosed && _exception.get()) { |