*** empty log message ***

3 files changed, 9 insertions, 11 deletions

diff --git a/ace/Object_Manager.cpp b/ace/Object_Manager.cpp
index 6c158d3182d..84a9dd589f3 100644
--- a/ace/Object_Manager.cpp
+++ b/ace/Object_Manager.cpp
@@ -665,13 +665,17 @@ ACE_Object_Manager::~ACE_Object_Manager (void)
         (*info.cleanup_hook_) (info.object_, info.param_);
     }
 
+  // Close the main thread's TSS, including its Log_Msg instance.
+  ACE_OS::cleanup_tss (1 /* main thread */);
+
+  //
+  // Note:  Do not access Log Msg after this since it is gone
+  //
+
   // Unlink all services in the Service Repository and close/delete
   // all ACE library services and singletons.
   ACE_Service_Config::close ();
 
-  // Close the main thread's TSS, including its Log_Msg instance.
-  ACE_OS::cleanup_tss (1 /* main thread */);
-
   // Close down Winsock (no-op on other platforms).
   ACE_OS::socket_fini ();
 
diff --git a/ace/Service_Config.cpp b/ace/Service_Config.cpp
index 54b6d542eb6..2311050a5ad 100644
--- a/ace/Service_Config.cpp
+++ b/ace/Service_Config.cpp
@@ -641,9 +641,6 @@ ACE_Service_Config::close (void)
 {
   ACE_TRACE ("ACE_Service_Config::close");
 
-  if (!ACE_Service_Config::debug_)
-    ACE_Log_Msg::disable_debug_messages ();
-
   // ACE_Service_Config must be deleted before the Singletons are
   // closed so that an object's fini() method may reference a
   // valid ACE_Reactor.
@@ -657,9 +654,6 @@ ACE_Service_Config::close (void)
   delete ACE_Service_Config::static_svcs_;
   ACE_Service_Config::static_svcs_ = 0;
 
-  if (!ACE_Service_Config::debug_)
-    ACE_Log_Msg::enable_debug_messages ();
-
   return 0;
 }
 
diff --git a/ace/Service_Repository.cpp b/ace/Service_Repository.cpp
index 80e343f6faf..317bbeaad3f 100644
--- a/ace/Service_Repository.cpp
+++ b/ace/Service_Repository.cpp
@@ -150,8 +150,8 @@ ACE_Service_Repository::close (void)
       while (this->current_size_ > 0)
         {
           int i = --this->current_size_;
-          ACE_DEBUG ((LM_DEBUG,  ASYS_TEXT ("shutting down %s\n"),
-                      this->service_vector_[i]->name ()));
+          //ACE_DEBUG ((LM_DEBUG,  ASYS_TEXT ("shutting down %s\n"),
+          //            this->service_vector_[i]->name ()));
           delete (ACE_Service_Type *)this->service_vector_[i];
         }