Wed May 4 15:07:46 UTC 2011 Chad Beaulac <chad.beaulac@objectivesolutions.com>

* ace/Stream.cpp:
  Modified ACE_Stream::remove(name,flags) so close is always called
  on the module that's removed regardless of the flags. Close needs
  to be called to ensure proper lifecycle management when the
  ACE_Service_Repository shuts down in its fini method.
  Bugzilla #3912

* tests/Bug_3912_Regression_Test.conf:
* tests/Bug_3912_Regression_Test.cpp:
* tests/run_test.lst
* tests/test.mpc
  Added test to assert that close is called.

1 files changed, 3 insertions, 3 deletions

diff --git a/ACE/ace/Stream.cpp b/ACE/ace/Stream.cpp
index 1346e0dda20..74185923911 100644
--- a/ACE/ace/Stream.cpp
+++ b/ACE/ace/Stream.cpp
@@ -260,12 +260,12 @@ ACE_Stream<ACE_SYNCH_USE>::remove (const ACE_TCHAR *name,
         else
           prev->link (mod->next ());
 
+        // Close down the module.
+        mod->close (flags);
+        
         // Don't delete the Module unless the flags request this.
         if (flags != ACE_Module<ACE_SYNCH_USE>::M_DELETE_NONE)
           {
-            // Close down the module.
-            mod->close (flags);
-
             // Release the memory.
             delete mod;
           }