diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2005-11-11 13:56:10 +0000 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2005-11-11 13:56:10 +0000 |
| commit | 930e9797f420ed538bc4e55ffeb76b8596e12715 (patch) | |
| tree | 2fdac6237a544c168430c6e94804551117e094e0 /cpp/src/IceGrid/DescriptorHelper.h | |
| parent | fix a copy problem (diff) | |
| download | ice-930e9797f420ed538bc4e55ffeb76b8596e12715.tar.bz2 ice-930e9797f420ed538bc4e55ffeb76b8596e12715.tar.xz ice-930e9797f420ed538bc4e55ffeb76b8596e12715.zip | |
:activate() would contact the locator even if the OA id was empty.
Fixed a bug where ${node.os} for example couldn't be used in distribution
directories.
Unknown elements in XML file are now treated as errors.
Diffstat (limited to 'cpp/src/IceGrid/DescriptorHelper.h')
| -rw-r--r-- | cpp/src/IceGrid/DescriptorHelper.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/cpp/src/IceGrid/DescriptorHelper.h b/cpp/src/IceGrid/DescriptorHelper.h index 0572748ff3c..85043c40de7 100644 --- a/cpp/src/IceGrid/DescriptorHelper.h +++ b/cpp/src/IceGrid/DescriptorHelper.h @@ -246,7 +246,7 @@ public: const NodeDescriptor& getDescriptor() const; const NodeDescriptor& getInstance() const; void getServerInfos(const std::string&, std::map<std::string, ServerInfo>&) const; - DistributionDescriptorDict getDistributions(const std::string&) const; + bool hasDistributions(const std::string&) const; bool hasServers() const; bool hasServer(const std::string&) const; void print(IceUtil::Output&) const; @@ -281,8 +281,7 @@ public: const ApplicationDescriptor& getInstance() const; TemplateDescriptor getServerTemplate(const std::string&) const; TemplateDescriptor getServiceTemplate(const std::string&) const; - void getDistributions(DistributionDescriptor&, std::map<std::string, DistributionDescriptorDict>&, - const std::string& = std::string()) const; + void getDistributions(DistributionDescriptor&, std::vector<std::string>&,const std::string& = std::string()) const; void print(IceUtil::Output&) const; void printDiff(IceUtil::Output&, const ApplicationHelper&) const; |