Thu Aug 2 09:22:12 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>

2 files changed, 12 insertions, 7 deletions

diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index cb25fe0a248..da27ee8c9a7 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,7 +1,15 @@
+Thu Aug  2 09:22:12 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/Log_Msg.cpp:
+          Use regular reinterpret_cast, use 0 instead of NULL and
+          in case setspecific fails just do a printf, not an ACE_DEBUG
+          because that will use ACE_Log_Msg again.
+
 Wed Aug  1 21:39:04 UTC 2007  Dale Wilson  <wilsond@ociweb.com>
 
         * bin/tao_orb_tests.lst:
           Enable TAO\tests\Bug_2935_Regression
+
 Wed Aug  1 18:55:12 UTC 2007  Martin Corino  <mcorino@remedy.nl>
 
         * bin/PerlACE/ConfigList.pm:
diff --git a/ACE/ace/Log_Msg.cpp b/ACE/ace/Log_Msg.cpp
index bc35a62c802..db309c0dcca 100644
--- a/ACE/ace/Log_Msg.cpp
+++ b/ACE/ace/Log_Msg.cpp
@@ -508,24 +508,21 @@ ACE_Log_Msg::close (void)
              // is disabled. Otherwise in the event of a dynamic library
              // unload of libACE, by a program not linked with libACE,
              // ACE_TSS_cleanup will be invoked after libACE has been unloaded.
-
              ACE_Log_Msg *tss_log_msg = 0;
 
              // Get the tss_log_msg from thread-specific storage.
              if ( ACE_Thread::getspecific (*(log_msg_tss_key ()),
-                           ACE_reinterpret_cast (void **, &tss_log_msg)) != -1
+                           reinterpret_cast <void **> (&tss_log_msg)) != -1
                   && tss_log_msg)
              {
                // we haven't been cleaned up
                ACE_TSS_cleanup(tss_log_msg);
 
                if ( ACE_Thread::setspecific( (*log_msg_tss_key()),
-                                             (void *)NULL ) != 0 )
-               {
-                  ACE_DEBUG ((LM_DEBUG,
-                              ACE_TEXT ("(%P|%t) ACE_Log_Msg::close failed to ACE_Thread::setspecific to NULL\n")));
+                                             (void *)0 ) != 0 )
+                {
+                  ACE_OS::printf ("ACE_Log_Msg::close failed to ACE_Thread::setspecific to 0\n");
                }
-
              }
 #endif /* ACE_HAS_BROKEN_THREAD_KEYFREE */
            }