diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2014-07-25 11:54:05 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2014-07-25 11:54:05 +0200 |
| commit | 78aa45dcf75316fc2db511938b7c8249511e54ca (patch) | |
| tree | b68cda42fe86a4b868b7e72de55aea4d00dba26b /cpp/src/Ice/LocatorInfo.cpp | |
| parent | Build fixes for MinGW 4.7.2-32 (diff) | |
| download | ice-78aa45dcf75316fc2db511938b7c8249511e54ca.tar.bz2 ice-78aa45dcf75316fc2db511938b7c8249511e54ca.tar.xz ice-78aa45dcf75316fc2db511938b7c8249511e54ca.zip | |
Improved IceGrid discovery, it now works with icegrid registry slaves and nodes
Diffstat (limited to 'cpp/src/Ice/LocatorInfo.cpp')
| -rw-r--r-- | cpp/src/Ice/LocatorInfo.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/cpp/src/Ice/LocatorInfo.cpp b/cpp/src/Ice/LocatorInfo.cpp index dfdadb06c86..e668dc3a248 100644 --- a/cpp/src/Ice/LocatorInfo.cpp +++ b/cpp/src/Ice/LocatorInfo.cpp @@ -540,7 +540,11 @@ IceInternal::LocatorInfo::getLocatorRegistry() // Do not make locator calls from within sync. // LocatorRegistryPrx locatorRegistry = _locator->getRegistry(); - + if(!locatorRegistry) + { + return 0; + } + { IceUtil::Mutex::Lock sync(*this); |