From b5042ce24aaa2dcff2092046b322ff61c3d9ef8c Mon Sep 17 00:00:00 2001 From: Benoit Foucher Date: Wed, 7 Jan 2009 19:37:17 +0100 Subject: Squashed commit of the following: commit 8019e6de4480f361a83d8944afec60793454c322 Author: Benoit Foucher Date: Wed Jan 7 17:16:40 2009 +0100 Fixed bug 3516 - Fixed scaling issue when using round-robin replica groups commit 6c36afb32dda8b37b7d5330ed51a439bc73b17db Author: Benoit Foucher Date: Wed Jan 7 17:16:36 2009 +0100 Fixed bug 3230 - IceGrid node leak --- cpp/src/IceGrid/IceGridNode.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'cpp/src/IceGrid/IceGridNode.cpp') diff --git a/cpp/src/IceGrid/IceGridNode.cpp b/cpp/src/IceGrid/IceGridNode.cpp index 1b55a7e2066..4dc9a62e978 100644 --- a/cpp/src/IceGrid/IceGridNode.cpp +++ b/cpp/src/IceGrid/IceGridNode.cpp @@ -717,12 +717,6 @@ NodeService::stop() // _node->getPlatformInfo().stop(); - // - // Break cylic reference counts. - // - _node->destroy(); - _node = 0; - // // We can now safely shutdown the communicator. // @@ -738,6 +732,12 @@ NodeService::stop() warning(ostr.str()); } + // + // Break cylic reference counts. + // + _node->shutdown(); + _node = 0; + // // And shutdown the collocated registry. // -- cgit v1.2.3