diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2006-05-29 16:14:34 +0000 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2006-05-29 16:14:34 +0000 |
| commit | 61bd0677a5696512209a662930dd233eca31d29e (patch) | |
| tree | 69acd8bc13389a6397e5b9f321dd8d5126faf9fc /cpp/src/IceGrid/DescriptorHelper.cpp | |
| parent | Fixes (diff) | |
| download | ice-61bd0677a5696512209a662930dd233eca31d29e.tar.bz2 ice-61bd0677a5696512209a662930dd233eca31d29e.tar.xz ice-61bd0677a5696512209a662930dd233eca31d29e.zip | |
The default value for the adaper endpoints in the XML descriptors in now
"default"
Diffstat (limited to 'cpp/src/IceGrid/DescriptorHelper.cpp')
| -rw-r--r-- | cpp/src/IceGrid/DescriptorHelper.cpp | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/cpp/src/IceGrid/DescriptorHelper.cpp b/cpp/src/IceGrid/DescriptorHelper.cpp index 090a9980063..c5dc02b73cc 100644 --- a/cpp/src/IceGrid/DescriptorHelper.cpp +++ b/cpp/src/IceGrid/DescriptorHelper.cpp @@ -906,6 +906,15 @@ CommunicatorHelper::instantiateImpl(const CommunicatorDescriptorPtr& instance, c } adapter.objects = resolve(p->objects); instance->adapters.push_back(adapter); + + // + // Make sure the endpoints are defined. + // + string endpoints = IceGrid::getProperty(instance->propertySet.properties, adapter.name + ".Endpoints"); + if(endpoints.empty()) + { + resolve.exception("invalid endpoints for adapter `" + adapter.name + "': empty string"); + } } for(DbEnvDescriptorSeq::const_iterator s = _desc->dbEnvs.begin(); s != _desc->dbEnvs.end(); ++s) @@ -1037,7 +1046,7 @@ CommunicatorHelper::printPropertySet(Output& out, const PropertySetDescriptor& p string CommunicatorHelper::getProperty(const string& name) const { - return IceGrid::getProperty(_desc->propertySet, name); + return IceGrid::getProperty(_desc->propertySet.properties, name); } ServiceHelper::ServiceHelper(const Ice::CommunicatorPtr& communicator, const ServiceDescriptorPtr& descriptor) : |