Merge commit 'origin/R3_3_branch'

Conflicts:

	cs/demo/WCF/latency/Client.cs
	cs/demo/WCF/latency_m/Client.cs
	cs/demo/WCF/throughput/Client.cs
	cs/demo/WCF/throughput_m/Client.cs
	cs/demo/WCF/throughput_m/Service.cs
	java/demo/Database/library/BookI.java
	java/demo/Database/library/BookQueryResultI.java
	java/demo/Database/library/Client.java
	java/demo/Database/library/ConnectionPool.java
	java/demo/Database/library/DispatchInterceptorI.java
	java/demo/Database/library/Glacier2Session.ice
	java/demo/Database/library/Glacier2SessionManagerI.java
	java/demo/Database/library/Grammar.java
	java/demo/Database/library/Library.ice
	java/demo/Database/library/LibraryI.java
	java/demo/Database/library/Parser.java
	java/demo/Database/library/ReapThread.java
	java/demo/Database/library/RunParser.java
	java/demo/Database/library/SQLRequestContext.java
	java/demo/Database/library/Scanner.java
	java/demo/Database/library/Server.java
	java/demo/Database/library/Session.ice
	java/demo/Database/library/SessionFactoryI.java
	java/demo/Database/library/SessionI.java
	java/demo/Database/library/Token.java
	java/demo/Database/library/build.xml
	java/demo/Database/library/config.client

1 files changed, 9 insertions, 1 deletions

diff --git a/cpp/src/IceGrid/NodeI.cpp b/cpp/src/IceGrid/NodeI.cpp
index 6381b39760e..77ed21db79e 100644
--- a/cpp/src/IceGrid/NodeI.cpp
+++ b/cpp/src/IceGrid/NodeI.cpp
@@ -831,9 +831,17 @@ NodeI::read(const string& filename, Ice::Long pos, int size, Ice::Long& newPos,
 }
 
 void
-NodeI::destroy()
+NodeI::shutdown()
 {
     IceUtil::Mutex::Lock sync(_serversLock);
+    for(map<string, set<ServerIPtr> >::const_iterator p = _serversByApplication.begin();
+        p != _serversByApplication.end(); ++p)
+    {    
+        for(set<ServerIPtr>::const_iterator q = p->second.begin(); q != p->second.end(); ++q)
+        {
+            (*q)->shutdown();
+        }
+    }
     _serversByApplication.clear();
 }