diff options
| author | Dwayne Boone <dwayne@zeroc.com> | 2006-11-08 14:30:19 +0000 |
|---|---|---|
| committer | Dwayne Boone <dwayne@zeroc.com> | 2006-11-08 14:30:19 +0000 |
| commit | 82e38314775c2e25119f42fc74289091c78161b7 (patch) | |
| tree | 8a06cf36e796c347211130decef6c906919f1f6d /cpp/src/IceGrid/AdminSessionI.cpp | |
| parent | Renamed "wait for activation" to "server lifetime" (diff) | |
| download | ice-82e38314775c2e25119f42fc74289091c78161b7.tar.bz2 ice-82e38314775c2e25119f42fc74289091c78161b7.tar.xz ice-82e38314775c2e25119f42fc74289091c78161b7.zip | |
Fix C++Builder build
Diffstat (limited to 'cpp/src/IceGrid/AdminSessionI.cpp')
| -rw-r--r-- | cpp/src/IceGrid/AdminSessionI.cpp | 54 |
1 files changed, 44 insertions, 10 deletions
diff --git a/cpp/src/IceGrid/AdminSessionI.cpp b/cpp/src/IceGrid/AdminSessionI.cpp index bdf87d55c6a..de31ff90996 100644 --- a/cpp/src/IceGrid/AdminSessionI.cpp +++ b/cpp/src/IceGrid/AdminSessionI.cpp @@ -58,16 +58,50 @@ AdminSessionI::setObservers(const RegistryObserverPrx& registryObserver, throw ex; } - setupObserverSubscription(RegistryObserverTopicName, - registryObserver ? registryObserver->ice_timeout(_timeout * 1000) : Ice::ObjectPrx()); - setupObserverSubscription(NodeObserverTopicName, - nodeObserver ? nodeObserver->ice_timeout(_timeout * 1000) : Ice::ObjectPrx()); - setupObserverSubscription(ApplicationObserverTopicName, - appObserver ? appObserver->ice_timeout(_timeout * 1000) : Ice::ObjectPrx()); - setupObserverSubscription(AdapterObserverTopicName, - adapterObserver ? adapterObserver->ice_timeout(_timeout * 1000) : Ice::ObjectPrx()); - setupObserverSubscription(ObjectObserverTopicName, - objectObserver ? objectObserver->ice_timeout(_timeout * 1000) : Ice::ObjectPrx()); + if(registryObserver) + { + setupObserverSubscription(RegistryObserverTopicName, registryObserver->ice_timeout(_timeout * 1000)); + } + else + { + setupObserverSubscription(RegistryObserverTopicName, Ice::ObjectPrx()); + } + + if(nodeObserver) + { + setupObserverSubscription(NodeObserverTopicName, nodeObserver->ice_timeout(_timeout * 1000)); + } + else + { + setupObserverSubscription(NodeObserverTopicName, Ice::ObjectPrx()); + } + + if(appObserver) + { + setupObserverSubscription(ApplicationObserverTopicName, appObserver->ice_timeout(_timeout * 1000)); + } + else + { + setupObserverSubscription(ApplicationObserverTopicName, Ice::ObjectPrx()); + } + + if(adapterObserver) + { + setupObserverSubscription(AdapterObserverTopicName, adapterObserver->ice_timeout(_timeout * 1000)); + } + else + { + setupObserverSubscription(AdapterObserverTopicName, Ice::ObjectPrx()); + } + + if(objectObserver) + { + setupObserverSubscription(ObjectObserverTopicName, objectObserver->ice_timeout(_timeout * 1000)); + } + else + { + setupObserverSubscription(ObjectObserverTopicName, Ice::ObjectPrx()); + } } void |