From 434b3f520954279abf4403ee95f896d684c6532a Mon Sep 17 00:00:00 2001
From: Jose <jose@zeroc.com>
Date: Tue, 23 Dec 2008 13:43:12 +0100
Subject: Fix 3601 - plugins can be destroyed twice

---
 cpp/src/Ice/PluginManagerI.cpp | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'cpp/src/Ice/PluginManagerI.cpp')

diff --git a/cpp/src/Ice/PluginManagerI.cpp b/cpp/src/Ice/PluginManagerI.cpp
index 36812c69ac5..4541212d5b7 100644
--- a/cpp/src/Ice/PluginManagerI.cpp
+++ b/cpp/src/Ice/PluginManagerI.cpp
@@ -118,11 +118,15 @@ Ice::PluginManagerI::destroy()
 
     if(_communicator)
     {
-        map<string, PluginPtr>::iterator r;
-        for(r = _plugins.begin(); r != _plugins.end(); ++r)
+
+        if(_initialized)
         {
-            r->second->destroy();
-            r->second = 0;
+            map<string, PluginPtr>::iterator r;
+            for(r = _plugins.begin(); r != _plugins.end(); ++r)
+            {
+                r->second->destroy();
+                r->second = 0;
+            }
         }
         
         _communicator = 0;
-- 
cgit v1.2.3