diff options
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/IceGrid/DescriptorHelper.cpp | 1 | ||||
| -rw-r--r-- | cpp/src/IceGrid/IceGridNode.cpp | 4 | ||||
| -rw-r--r-- | cpp/src/IceGrid/ServerI.cpp | 4 | ||||
| -rw-r--r-- | cpp/src/IceGrid/Topics.cpp | 3 |
4 files changed, 6 insertions, 6 deletions
diff --git a/cpp/src/IceGrid/DescriptorHelper.cpp b/cpp/src/IceGrid/DescriptorHelper.cpp index 9a907fab185..090a9980063 100644 --- a/cpp/src/IceGrid/DescriptorHelper.cpp +++ b/cpp/src/IceGrid/DescriptorHelper.cpp @@ -2253,6 +2253,7 @@ ApplicationHelper::ApplicationHelper(const Ice::CommunicatorPtr& communicator, c // // Instantiate the application definition. // + _instance.name = _def.name; _instance.variables = _def.variables; _instance.serverTemplates = _def.serverTemplates; _instance.serviceTemplates = _def.serviceTemplates; diff --git a/cpp/src/IceGrid/IceGridNode.cpp b/cpp/src/IceGrid/IceGridNode.cpp index 9104d68ece5..7bcf8fa8389 100644 --- a/cpp/src/IceGrid/IceGridNode.cpp +++ b/cpp/src/IceGrid/IceGridNode.cpp @@ -130,7 +130,7 @@ class CollocatedRegistry : public RegistryI public: CollocatedRegistry(const CommunicatorPtr&, const ActivatorPtr&); - virtual void shutdown(const Current&); + virtual void shutdown(); private: @@ -146,7 +146,7 @@ CollocatedRegistry::CollocatedRegistry(const CommunicatorPtr& communicator, cons } void -CollocatedRegistry::shutdown(const Current&) +CollocatedRegistry::shutdown() { _activator->shutdown(); } diff --git a/cpp/src/IceGrid/ServerI.cpp b/cpp/src/IceGrid/ServerI.cpp index 1cc75f30028..e697ba17b74 100644 --- a/cpp/src/IceGrid/ServerI.cpp +++ b/cpp/src/IceGrid/ServerI.cpp @@ -1351,7 +1351,7 @@ ServerI::destroy() catch(const string& msg) { Ice::Warning out(_node->getTraceLevels()->logger); - out << "removing server directory `" << _serverDir << "' failed:" << msg; + out << "removing server directory `" << _serverDir << "' failed: " << msg; } // @@ -1680,7 +1680,7 @@ ServerI::updateImpl(const string& application, const ServerDescriptorPtr& desc) catch(const Ice::LocalException& ex) { ostringstream os; - os << "unexpected exception while trying to find user account for user `" << user << "':" << ex; + os << "unexpected exception while trying to find user account for user `" << user << "':\n" << ex; throw os.str(); } } diff --git a/cpp/src/IceGrid/Topics.cpp b/cpp/src/IceGrid/Topics.cpp index 0151bfca666..e11fbe285e5 100644 --- a/cpp/src/IceGrid/Topics.cpp +++ b/cpp/src/IceGrid/Topics.cpp @@ -328,8 +328,7 @@ RegistryObserverTopic::applicationUpdated(int serial, const ApplicationUpdateDes if(p != _applications.end()) { ApplicationHelper helper(c.adapter->getCommunicator(), p->second); - helper.update(desc); - p->second = helper.getDescriptor(); + p->second = helper.update(desc); } } catch(const DeploymentException& ex) |