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/ServerI.cpp | |
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/ServerI.cpp')
-rw-r--r-- | cpp/src/IceGrid/ServerI.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/cpp/src/IceGrid/ServerI.cpp b/cpp/src/IceGrid/ServerI.cpp index 09b7ed28db0..8cd5ce1bad0 100644 --- a/cpp/src/IceGrid/ServerI.cpp +++ b/cpp/src/IceGrid/ServerI.cpp @@ -697,6 +697,13 @@ ServerI::getId() const return _id; } +DistributionDescriptor +ServerI::getDistribution() const +{ + Lock sync(*this); + return _desc->distrib; +} + void ServerI::load(const AMD_Node_loadServerPtr& amdCB, const string& application, const ServerDescriptorPtr& desc) { |