From 1d9fbeaa07f2c1a1e657197a65ec158cb1779ccc Mon Sep 17 00:00:00 2001 From: Benoit Foucher Date: Mon, 25 Feb 2008 16:49:12 +0100 Subject: Changed the IceGrid node to be more conservative when removing server directories --- cpp/src/IceGrid/IceGridNode.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'cpp/src/IceGrid/IceGridNode.cpp') diff --git a/cpp/src/IceGrid/IceGridNode.cpp b/cpp/src/IceGrid/IceGridNode.cpp index 9f997d2b577..c8ee67a6d18 100644 --- a/cpp/src/IceGrid/IceGridNode.cpp +++ b/cpp/src/IceGrid/IceGridNode.cpp @@ -97,7 +97,7 @@ class CollocatedRegistry : public RegistryI { public: - CollocatedRegistry(const CommunicatorPtr&, const ActivatorPtr&); + CollocatedRegistry(const CommunicatorPtr&, const ActivatorPtr&, bool); virtual void shutdown(); private: @@ -135,8 +135,8 @@ private: } -CollocatedRegistry::CollocatedRegistry(const CommunicatorPtr& communicator, const ActivatorPtr& activator) : - RegistryI(communicator, new TraceLevels(communicator, "IceGrid.Registry")), +CollocatedRegistry::CollocatedRegistry(const CommunicatorPtr& com, const ActivatorPtr& activator, bool nowarn) : + RegistryI(com, new TraceLevels(com, "IceGrid.Registry"), nowarn), _activator(activator) { } @@ -300,8 +300,8 @@ NodeService::start(int argc, char* argv[]) // if(properties->getPropertyAsInt("IceGrid.Node.CollocateRegistry") > 0) { - _registry = new CollocatedRegistry(communicator(), _activator); - if(!_registry->start(nowarn)) + _registry = new CollocatedRegistry(communicator(), _activator, nowarn); + if(!_registry->start()) { return false; } -- cgit v1.2.3