diff options
| author | Brent Eagles <brent@zeroc.com> | 2006-06-19 13:47:18 +0000 |
|---|---|---|
| committer | Brent Eagles <brent@zeroc.com> | 2006-06-19 13:47:18 +0000 |
| commit | cf56ea70de05f2d71cab3fb227d48dbab37d2741 (patch) | |
| tree | 271866f2ceaca5c40907f20bbb3f38d97a0bf606 /cpp | |
| parent | Fix for bug 1047 (diff) | |
| download | ice-cf56ea70de05f2d71cab3fb227d48dbab37d2741.tar.bz2 ice-cf56ea70de05f2d71cab3fb227d48dbab37d2741.tar.xz ice-cf56ea70de05f2d71cab3fb227d48dbab37d2741.zip | |
Add missing check for null adminAdapters in the FilterManager constructor.
Diffstat (limited to 'cpp')
| -rwxr-xr-x | cpp/src/Glacier2/FilterManager.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/cpp/src/Glacier2/FilterManager.cpp b/cpp/src/Glacier2/FilterManager.cpp index bc3f5f24f79..09d137ed0e0 100755 --- a/cpp/src/Glacier2/FilterManager.cpp +++ b/cpp/src/Glacier2/FilterManager.cpp @@ -99,9 +99,12 @@ Glacier2::FilterManager::FilterManager(const ObjectAdapterPtr& adapter, const Gl { try { - _categoriesPrx = Glacier2::StringSetPrx::uncheckedCast(_adapter->addWithUUID(_categories)); - _adapterIdsPrx = Glacier2::StringSetPrx::uncheckedCast(_adapter->addWithUUID(_adapters)); - _identitiesPrx = Glacier2::IdentitySetPrx::uncheckedCast(_adapter->addWithUUID(_identities)); + if(_adapter) + { + _categoriesPrx = Glacier2::StringSetPrx::uncheckedCast(_adapter->addWithUUID(_categories)); + _adapterIdsPrx = Glacier2::StringSetPrx::uncheckedCast(_adapter->addWithUUID(_adapters)); + _identitiesPrx = Glacier2::IdentitySetPrx::uncheckedCast(_adapter->addWithUUID(_identities)); + } } catch(...) { |