diff options
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/IceGrid/DescriptorBuilder.cpp | 4 | ||||
| -rw-r--r-- | cpp/src/IceGrid/Internal.ice | 2 | ||||
| -rw-r--r-- | cpp/src/IceGrid/NodeI.cpp | 2 | ||||
| -rw-r--r-- | cpp/src/IceGrid/ServerI.cpp | 3 | ||||
| -rw-r--r-- | cpp/src/IceGrid/ServerI.h | 2 | ||||
| -rw-r--r-- | cpp/src/IceGrid/WaitQueue.cpp | 2 |
6 files changed, 8 insertions, 7 deletions
diff --git a/cpp/src/IceGrid/DescriptorBuilder.cpp b/cpp/src/IceGrid/DescriptorBuilder.cpp index e43301810fa..5f73fcc2e86 100644 --- a/cpp/src/IceGrid/DescriptorBuilder.cpp +++ b/cpp/src/IceGrid/DescriptorBuilder.cpp @@ -587,8 +587,8 @@ IceBoxDescriptorBuilder::init(const IceBoxDescriptorPtr& desc, const XmlAttribut _descriptor = desc; PropertyDescriptor prop; - prop.name = "IceBox.ServiceManager.Identity"; - prop.value = _descriptor->id + "/ServiceManager"; + prop.name = "IceBox.InstanceName"; + prop.value = _descriptor->id; _descriptor->properties.push_back(prop); AdapterDescriptor adapter; diff --git a/cpp/src/IceGrid/Internal.ice b/cpp/src/IceGrid/Internal.ice index c820184aa3c..5022ffd41a2 100644 --- a/cpp/src/IceGrid/Internal.ice +++ b/cpp/src/IceGrid/Internal.ice @@ -171,7 +171,7 @@ interface Server * Set the process proxy. * **/ - ["ami"] void setProcess(Ice::Process* proc); + ["ami", "amd"] void setProcess(Ice::Process* proc); }; interface Node diff --git a/cpp/src/IceGrid/NodeI.cpp b/cpp/src/IceGrid/NodeI.cpp index 81dcc80826b..3a6139f2b34 100644 --- a/cpp/src/IceGrid/NodeI.cpp +++ b/cpp/src/IceGrid/NodeI.cpp @@ -264,7 +264,7 @@ NodeI::destroyServer_async(const AMD_Node_destroyServerPtr& amdCB, const string& { removeRecursive(_serversDir + "/" + name); } - catch(const string& msg) + catch(const string&) { } amdCB->ice_response(); diff --git a/cpp/src/IceGrid/ServerI.cpp b/cpp/src/IceGrid/ServerI.cpp index 6530be0a644..744eb289401 100644 --- a/cpp/src/IceGrid/ServerI.cpp +++ b/cpp/src/IceGrid/ServerI.cpp @@ -655,7 +655,7 @@ ServerI::isEnabled(const ::Ice::Current&) const } void -ServerI::setProcess(const Ice::ProcessPrx& process, const Ice::Current&) +ServerI::setProcess_async(const AMD_Server_setProcessPtr& amdCB, const Ice::ProcessPrx& process, const Ice::Current&) { bool deact = false; { @@ -663,6 +663,7 @@ ServerI::setProcess(const Ice::ProcessPrx& process, const Ice::Current&) _process = process; deact = _state == DeactivatingWaitForProcess; } + amdCB->ice_response(); if(deact) { deactivate(); diff --git a/cpp/src/IceGrid/ServerI.h b/cpp/src/IceGrid/ServerI.h index 2463083f8ef..9daeff7be39 100644 --- a/cpp/src/IceGrid/ServerI.h +++ b/cpp/src/IceGrid/ServerI.h @@ -75,7 +75,7 @@ public: virtual void setEnabled(bool, const ::Ice::Current&); virtual bool isEnabled(const ::Ice::Current& = Ice::Current()) const; - virtual void setProcess(const ::Ice::ProcessPrx&, const ::Ice::Current&); + virtual void setProcess_async(const AMD_Server_setProcessPtr&, const ::Ice::ProcessPrx&, const ::Ice::Current&); ServerDescriptorPtr getDescriptor() const; std::string getApplication() const; diff --git a/cpp/src/IceGrid/WaitQueue.cpp b/cpp/src/IceGrid/WaitQueue.cpp index a7a2b4e5aeb..6d7b058e6a4 100644 --- a/cpp/src/IceGrid/WaitQueue.cpp +++ b/cpp/src/IceGrid/WaitQueue.cpp @@ -89,7 +89,7 @@ WaitQueue::run() { (*p)->expired(false); } - catch(const Ice::LocalException& ex) + catch(const Ice::LocalException&) { // // TODO: Add some tracing. |