diff options
| author | Dwayne Boone <dwayne@zeroc.com> | 2007-06-27 12:28:22 -0230 |
|---|---|---|
| committer | Dwayne Boone <dwayne@zeroc.com> | 2007-06-27 12:28:22 -0230 |
| commit | 434441f3aa26788c9898ebcdba9f14fdd01a8291 (patch) | |
| tree | ddb80481e234fb1f066a37e21ad1c0a2768bde99 /cpp/src/IceGrid/RegistryI.cpp | |
| parent | Bug 2270. (diff) | |
| download | ice-434441f3aa26788c9898ebcdba9f14fdd01a8291.tar.bz2 ice-434441f3aa26788c9898ebcdba9f14fdd01a8291.tar.xz ice-434441f3aa26788c9898ebcdba9f14fdd01a8291.zip | |
http://bugzilla.zeroc.com/bugzilla/show_bug.cgi?id=2269 - do not exit if permissions verifier or session manager are not running at startup
Diffstat (limited to 'cpp/src/IceGrid/RegistryI.cpp')
| -rw-r--r-- | cpp/src/IceGrid/RegistryI.cpp | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/cpp/src/IceGrid/RegistryI.cpp b/cpp/src/IceGrid/RegistryI.cpp index 901e351e8d7..84f242ab6f7 100644 --- a/cpp/src/IceGrid/RegistryI.cpp +++ b/cpp/src/IceGrid/RegistryI.cpp @@ -958,6 +958,12 @@ RegistryI::getPermissionsVerifier(const ObjectAdapterPtr& adapter, try { verifier = _communicator->propertyToProxy(verifierProperty); + if(!verifier) + { + Error out(_communicator->getLogger()); + out << "permissions verifier `" + verifierPropertyValue + "' is invalid"; + return 0; + } assert(_nullPermissionsVerifier); if(verifier->ice_getIdentity() == _nullPermissionsVerifier->ice_getIdentity()) { @@ -1057,6 +1063,12 @@ RegistryI::getSSLPermissionsVerifier(const IceGrid::LocatorPrx& locator, const s try { verifier = _communicator->propertyToProxy(verifierProperty); + if(!verifier) + { + Error out(_communicator->getLogger()); + out << "ssl permissions verifier `" + verifierPropertyValue + "' is invalid"; + return 0; + } assert(_nullSSLPermissionsVerifier); if(verifier->ice_getIdentity() == _nullSSLPermissionsVerifier->ice_getIdentity()) { @@ -1066,7 +1078,7 @@ RegistryI::getSSLPermissionsVerifier(const IceGrid::LocatorPrx& locator, const s catch(const LocalException& ex) { Error out(_communicator->getLogger()); - out << "permissions verifier `" + verifierPropertyValue + "' is invalid:\n" << ex; + out << "ssl permissions verifier `" + verifierPropertyValue + "' is invalid:\n" << ex; return 0; } } @@ -1088,7 +1100,7 @@ RegistryI::getSSLPermissionsVerifier(const IceGrid::LocatorPrx& locator, const s if(!verifierPrx) { Error out(_communicator->getLogger()); - out << "permissions verifier `" + verifierProperty + "' is invalid"; + out << "ssl permissions verifier `" + verifierProperty + "' is invalid"; return 0; } } @@ -1097,7 +1109,7 @@ RegistryI::getSSLPermissionsVerifier(const IceGrid::LocatorPrx& locator, const s if(!nowarn) { Warning out(_communicator->getLogger()); - out << "couldn't contact permissions verifier `" + verifierProperty + "':\n" << ex; + out << "couldn't contact ssl permissions verifier `" + verifierProperty + "':\n" << ex; } verifierPrx = Glacier2::SSLPermissionsVerifierPrx::uncheckedCast(verifier->ice_locator(locator)); } |