diff options
| author | Dwayne Boone <dwayne@zeroc.com> | 2009-01-02 15:16:46 -0330 |
|---|---|---|
| committer | Dwayne Boone <dwayne@zeroc.com> | 2009-01-02 15:16:46 -0330 |
| commit | 51ee7620f82e4232baf587ee052001751c23e481 (patch) | |
| tree | 08baaf92bddeca3f33acfe1bb38620606de7a99b /cpp/src/Ice/PluginManagerI.cpp | |
| parent | The server now accepts anonymous clients. (diff) | |
| download | ice-51ee7620f82e4232baf587ee052001751c23e481.tar.bz2 ice-51ee7620f82e4232baf587ee052001751c23e481.tar.xz ice-51ee7620f82e4232baf587ee052001751c23e481.zip | |
Merged with R3_3_branch
Diffstat (limited to 'cpp/src/Ice/PluginManagerI.cpp')
| -rw-r--r-- | cpp/src/Ice/PluginManagerI.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
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; |