diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2015-02-02 11:14:08 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2015-02-02 11:14:08 +0100 |
| commit | eb6d76139abf33e8ffa193265bb1672fa37b8415 (patch) | |
| tree | 592045133ce5e8e96b158e05c23855869938a085 /cpp/src/IceGrid | |
| parent | Fixed IceGrid discovery plugin to not depend on IceGrid::Locator directly (diff) | |
| download | ice-eb6d76139abf33e8ffa193265bb1672fa37b8415.tar.bz2 ice-eb6d76139abf33e8ffa193265bb1672fa37b8415.tar.xz ice-eb6d76139abf33e8ffa193265bb1672fa37b8415.zip | |
Fixed bug which could cause Ice::NullHandleException in IceGrid replication
Diffstat (limited to 'cpp/src/IceGrid')
| -rw-r--r-- | cpp/src/IceGrid/ReplicaSessionManager.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cpp/src/IceGrid/ReplicaSessionManager.h b/cpp/src/IceGrid/ReplicaSessionManager.h index 3e69bf9ab9d..d0cee5d10b4 100644 --- a/cpp/src/IceGrid/ReplicaSessionManager.h +++ b/cpp/src/IceGrid/ReplicaSessionManager.h @@ -77,7 +77,7 @@ public: void destroy(); void registerAllWellKnownObjects(); - ReplicaSessionPrx getSession() const { return _thread->getSession(); } + ReplicaSessionPrx getSession() const { return _thread ? _thread->getSession() : ReplicaSessionPrx(); } IceGrid::InternalRegistryPrx findInternalRegistryForReplica(const Ice::Identity&); |