diff options
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/IceGrid/Database.cpp | 4 | ||||
| -rw-r--r-- | cpp/src/IceGrid/DescriptorHelper.cpp | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/cpp/src/IceGrid/Database.cpp b/cpp/src/IceGrid/Database.cpp index 89b4b6d9260..d140a009698 100644 --- a/cpp/src/IceGrid/Database.cpp +++ b/cpp/src/IceGrid/Database.cpp @@ -469,9 +469,9 @@ Database::getAllNodes(const string& expression) } ServerInfo -Database::getServerInfo(const std::string& name) +Database::getServerInfo(const std::string& id) { - return _serverCache.get(name)->getServerInfo(); + return _serverCache.get(id)->getServerInfo(); } ServerPrx diff --git a/cpp/src/IceGrid/DescriptorHelper.cpp b/cpp/src/IceGrid/DescriptorHelper.cpp index 7d7549681a0..9fdee887dea 100644 --- a/cpp/src/IceGrid/DescriptorHelper.cpp +++ b/cpp/src/IceGrid/DescriptorHelper.cpp @@ -1476,7 +1476,7 @@ NodeHelper::diff(const NodeHelper& helper) const update.name = _name; if(_definition.loadFactor != helper._definition.loadFactor) { - update.loadFactor = new BoxedLoadFactor(_definition.loadFactor); + update.loadFactor = new BoxedString(_definition.loadFactor); } update.variables = getDictUpdatedElts(helper._definition.variables, _definition.variables); @@ -1882,7 +1882,7 @@ ApplicationHelper::diff(const ApplicationHelper& helper) update.name = _definition.name; if(_definition.description != helper._definition.description) { - update.description = new BoxedDescription(_definition.description); + update.description = new BoxedString(_definition.description); } update.variables = getDictUpdatedElts(helper._definition.variables, _definition.variables); @@ -1919,7 +1919,7 @@ ApplicationHelper::diff(const ApplicationHelper& helper) nodeUpdate.variables = node.variables; nodeUpdate.servers = node.servers; nodeUpdate.serverInstances = node.serverInstances; - nodeUpdate.loadFactor = new BoxedLoadFactor(node.loadFactor); + nodeUpdate.loadFactor = new BoxedString(node.loadFactor); update.nodes.push_back(nodeUpdate); } else |