Thu Jul 29 02:27:05 UTC 2010 William R. Otte <wotte@dre.vanderbilt.edu>

        * DAnCE/LocalityManager/Daemon/Locality_Manager_Impl.cpp:

          Explicitly close the plugin manager in the shutdown operation instead of
          the destructor so it is called before the ORB is destroyed.

2 files changed, 10 insertions, 3 deletions

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index a05f43459e7..26d9449d3e6 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,10 @@
+Thu Jul 29 02:27:05 UTC 2010  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * DAnCE/LocalityManager/Daemon/Locality_Manager_Impl.cpp:
+
+          Explicitly close the plugin manager in the shutdown operation instead of
+          the destructor so it is called before the ORB is destroyed.
+
 Wed Jul 28 12:29:41 UTC 2010  Marcel Smit  <msmit@remedy.nl>
 
         * connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Receiver/QC_Receiver.cpp:
diff --git a/CIAO/DAnCE/LocalityManager/Daemon/Locality_Manager_Impl.cpp b/CIAO/DAnCE/LocalityManager/Daemon/Locality_Manager_Impl.cpp
index aa587404063..3c760bb58ec 100644
--- a/CIAO/DAnCE/LocalityManager/Daemon/Locality_Manager_Impl.cpp
+++ b/CIAO/DAnCE/LocalityManager/Daemon/Locality_Manager_Impl.cpp
@@ -39,8 +39,6 @@ namespace DAnCE
     DANCE_TRACE ("LocalityManager_i::~LocalityManager_i");
 
     this->scheduler_.terminate_scheduler ();
-
-    PLUGIN_MANAGER::close ();
   }
 
   void
@@ -985,6 +983,8 @@ namespace DAnCE
                      uuid_.c_str ()));
 
     this->orb_->shutdown ();
-    // Add your implementation here
+    
+    // Explicitly close the plugin manager to release memory.
+    PLUGIN_MANAGER::close ();
   }
 }