ChangeLogTag:Mon Jan 08 10:04:55 2001 Nanbor Wang <nanbor@cs.wustl.edu>

4 files changed, 58 insertions, 37 deletions

diff --git a/ChangeLog b/ChangeLog
index a3ae08a8254..702ba633129 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Mon Jan 08 10:04:55 2001  Nanbor Wang  <nanbor@cs.wustl.edu>
+
+	* ace/Thread_Manager.cpp (terminate): Reordered some statements so
+	  we get the thread descriptor's log_msg pointer before we delete
+	  the thread descriptor.  Thanks to Tomer Amiaz
+	  <Tomer@bandwiz.com> for reporting this.
+
 Sun Jan  7 16:51:42 2001  Darrell Brunsch <brunsch@uci.edu>
 
         * ace/ace_dll.dsp:
@@ -12,8 +19,8 @@ Sun Jan  7 16:51:42 2001  Darrell Brunsch <brunsch@uci.edu>
 
 Sun Jan  7 08:59:09 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
 
-	* tests/DLL_Test.cpp: Added a message in a ACE_ERROR statement.  
-	* tests/run_test.lst: Disabled MEM_Stream_Test in Linux. 
+	* tests/DLL_Test.cpp: Added a message in a ACE_ERROR statement.
+	* tests/run_test.lst: Disabled MEM_Stream_Test in Linux.
 
 Thu Jan  4 17:14:33 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
 
@@ -23,7 +30,7 @@ Thu Jan  4 17:14:33 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
 	  greater than zero. This seems to be creating problems with SunCC
 	  5 builds alone. Commenting out this piece for SunCC5 helps. This
 	  should also be a work around for the bug #750 in bugzilla.
-	  
+
 Thu Jan 04 17:07:48 2001  Luther Baker  <luther@cs.wustl.edu>
 
  	* ace/ace_dll.dsp
@@ -57,17 +64,17 @@ Wed Jan  3 15:44:31 2001  Darrell Brunsch <brunsch@uci.edu>
 
         * ace/OS.i:
 
-          Removed ACE_TIMEZONE since we found another workaround for 
+          Removed ACE_TIMEZONE since we found another workaround for
           platforms that define timezone () as a macro.
 
         * ace/OS.h:
         * ace/OS.i:
 
-          Moved much of the code from ACE_OS::timezone and 
-          ACE_OS::difftime into ace_timezone and ace_difftime.  Since 
-          some platforms don't have timezone or difftime, we needed 
-          to do something here so those methods aren't used.  Instead 
-          of figuring out what larger #if !... should be, it is easier 
+          Moved much of the code from ACE_OS::timezone and
+          ACE_OS::difftime into ace_timezone and ace_difftime.  Since
+          some platforms don't have timezone or difftime, we needed
+          to do something here so those methods aren't used.  Instead
+          of figuring out what larger #if !... should be, it is easier
           (and less error prone) to just move the code here.
 
 Wed Jan  3 13:10:39 2001  Darrell Brunsch <brunsch@uci.edu>
@@ -84,7 +91,7 @@ Wed Jan  3 12:56:13 2001  Darrell Brunsch <brunsch@uci.edu>
 
           Doug noticed some redundant code in expire while making his
           change on the 21st.  I checked and he was right, it looks like
-          I was moving around the loop termination conditionals and left 
+          I was moving around the loop termination conditionals and left
           some around.  Removed them and also added some better comments
           and made it more doxygen complient.
 
@@ -107,8 +114,8 @@ Tue Jan  3 10:30:42 2001  Darrell Brunsch <brunsch@uci.edu>
           this as a place to put random stuff about ACE and TAO on MSVC.
 
           Plus I think we need more nifty doxygen documents. ;-)  A tip of
-          the hat goes to Letha Etzkorn <letzkorn@cs.uah.edu> and 
-          Shivakumar Patil <shivakumar.patil@stdc.com> for bringing up 
+          the hat goes to Letha Etzkorn <letzkorn@cs.uah.edu> and
+          Shivakumar Patil <shivakumar.patil@stdc.com> for bringing up
           questions that led to the dump of info to this file.
 
         * ACE-INSTALL.html:
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index a3ae08a8254..702ba633129 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,10 @@
+Mon Jan 08 10:04:55 2001  Nanbor Wang  <nanbor@cs.wustl.edu>
+
+	* ace/Thread_Manager.cpp (terminate): Reordered some statements so
+	  we get the thread descriptor's log_msg pointer before we delete
+	  the thread descriptor.  Thanks to Tomer Amiaz
+	  <Tomer@bandwiz.com> for reporting this.
+
 Sun Jan  7 16:51:42 2001  Darrell Brunsch <brunsch@uci.edu>
 
         * ace/ace_dll.dsp:
@@ -12,8 +19,8 @@ Sun Jan  7 16:51:42 2001  Darrell Brunsch <brunsch@uci.edu>
 
 Sun Jan  7 08:59:09 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
 
-	* tests/DLL_Test.cpp: Added a message in a ACE_ERROR statement.  
-	* tests/run_test.lst: Disabled MEM_Stream_Test in Linux. 
+	* tests/DLL_Test.cpp: Added a message in a ACE_ERROR statement.
+	* tests/run_test.lst: Disabled MEM_Stream_Test in Linux.
 
 Thu Jan  4 17:14:33 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
 
@@ -23,7 +30,7 @@ Thu Jan  4 17:14:33 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
 	  greater than zero. This seems to be creating problems with SunCC
 	  5 builds alone. Commenting out this piece for SunCC5 helps. This
 	  should also be a work around for the bug #750 in bugzilla.
-	  
+
 Thu Jan 04 17:07:48 2001  Luther Baker  <luther@cs.wustl.edu>
 
  	* ace/ace_dll.dsp
@@ -57,17 +64,17 @@ Wed Jan  3 15:44:31 2001  Darrell Brunsch <brunsch@uci.edu>
 
         * ace/OS.i:
 
-          Removed ACE_TIMEZONE since we found another workaround for 
+          Removed ACE_TIMEZONE since we found another workaround for
           platforms that define timezone () as a macro.
 
         * ace/OS.h:
         * ace/OS.i:
 
-          Moved much of the code from ACE_OS::timezone and 
-          ACE_OS::difftime into ace_timezone and ace_difftime.  Since 
-          some platforms don't have timezone or difftime, we needed 
-          to do something here so those methods aren't used.  Instead 
-          of figuring out what larger #if !... should be, it is easier 
+          Moved much of the code from ACE_OS::timezone and
+          ACE_OS::difftime into ace_timezone and ace_difftime.  Since
+          some platforms don't have timezone or difftime, we needed
+          to do something here so those methods aren't used.  Instead
+          of figuring out what larger #if !... should be, it is easier
           (and less error prone) to just move the code here.
 
 Wed Jan  3 13:10:39 2001  Darrell Brunsch <brunsch@uci.edu>
@@ -84,7 +91,7 @@ Wed Jan  3 12:56:13 2001  Darrell Brunsch <brunsch@uci.edu>
 
           Doug noticed some redundant code in expire while making his
           change on the 21st.  I checked and he was right, it looks like
-          I was moving around the loop termination conditionals and left 
+          I was moving around the loop termination conditionals and left
           some around.  Removed them and also added some better comments
           and made it more doxygen complient.
 
@@ -107,8 +114,8 @@ Tue Jan  3 10:30:42 2001  Darrell Brunsch <brunsch@uci.edu>
           this as a place to put random stuff about ACE and TAO on MSVC.
 
           Plus I think we need more nifty doxygen documents. ;-)  A tip of
-          the hat goes to Letha Etzkorn <letzkorn@cs.uah.edu> and 
-          Shivakumar Patil <shivakumar.patil@stdc.com> for bringing up 
+          the hat goes to Letha Etzkorn <letzkorn@cs.uah.edu> and
+          Shivakumar Patil <shivakumar.patil@stdc.com> for bringing up
           questions that led to the dump of info to this file.
 
         * ACE-INSTALL.html:
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index a3ae08a8254..702ba633129 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,10 @@
+Mon Jan 08 10:04:55 2001  Nanbor Wang  <nanbor@cs.wustl.edu>
+
+	* ace/Thread_Manager.cpp (terminate): Reordered some statements so
+	  we get the thread descriptor's log_msg pointer before we delete
+	  the thread descriptor.  Thanks to Tomer Amiaz
+	  <Tomer@bandwiz.com> for reporting this.
+
 Sun Jan  7 16:51:42 2001  Darrell Brunsch <brunsch@uci.edu>
 
         * ace/ace_dll.dsp:
@@ -12,8 +19,8 @@ Sun Jan  7 16:51:42 2001  Darrell Brunsch <brunsch@uci.edu>
 
 Sun Jan  7 08:59:09 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
 
-	* tests/DLL_Test.cpp: Added a message in a ACE_ERROR statement.  
-	* tests/run_test.lst: Disabled MEM_Stream_Test in Linux. 
+	* tests/DLL_Test.cpp: Added a message in a ACE_ERROR statement.
+	* tests/run_test.lst: Disabled MEM_Stream_Test in Linux.
 
 Thu Jan  4 17:14:33 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
 
@@ -23,7 +30,7 @@ Thu Jan  4 17:14:33 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
 	  greater than zero. This seems to be creating problems with SunCC
 	  5 builds alone. Commenting out this piece for SunCC5 helps. This
 	  should also be a work around for the bug #750 in bugzilla.
-	  
+
 Thu Jan 04 17:07:48 2001  Luther Baker  <luther@cs.wustl.edu>
 
  	* ace/ace_dll.dsp
@@ -57,17 +64,17 @@ Wed Jan  3 15:44:31 2001  Darrell Brunsch <brunsch@uci.edu>
 
         * ace/OS.i:
 
-          Removed ACE_TIMEZONE since we found another workaround for 
+          Removed ACE_TIMEZONE since we found another workaround for
           platforms that define timezone () as a macro.
 
         * ace/OS.h:
         * ace/OS.i:
 
-          Moved much of the code from ACE_OS::timezone and 
-          ACE_OS::difftime into ace_timezone and ace_difftime.  Since 
-          some platforms don't have timezone or difftime, we needed 
-          to do something here so those methods aren't used.  Instead 
-          of figuring out what larger #if !... should be, it is easier 
+          Moved much of the code from ACE_OS::timezone and
+          ACE_OS::difftime into ace_timezone and ace_difftime.  Since
+          some platforms don't have timezone or difftime, we needed
+          to do something here so those methods aren't used.  Instead
+          of figuring out what larger #if !... should be, it is easier
           (and less error prone) to just move the code here.
 
 Wed Jan  3 13:10:39 2001  Darrell Brunsch <brunsch@uci.edu>
@@ -84,7 +91,7 @@ Wed Jan  3 12:56:13 2001  Darrell Brunsch <brunsch@uci.edu>
 
           Doug noticed some redundant code in expire while making his
           change on the 21st.  I checked and he was right, it looks like
-          I was moving around the loop termination conditionals and left 
+          I was moving around the loop termination conditionals and left
           some around.  Removed them and also added some better comments
           and made it more doxygen complient.
 
@@ -107,8 +114,8 @@ Tue Jan  3 10:30:42 2001  Darrell Brunsch <brunsch@uci.edu>
           this as a place to put random stuff about ACE and TAO on MSVC.
 
           Plus I think we need more nifty doxygen documents. ;-)  A tip of
-          the hat goes to Letha Etzkorn <letzkorn@cs.uah.edu> and 
-          Shivakumar Patil <shivakumar.patil@stdc.com> for bringing up 
+          the hat goes to Letha Etzkorn <letzkorn@cs.uah.edu> and
+          Shivakumar Patil <shivakumar.patil@stdc.com> for bringing up
           questions that led to the dump of info to this file.
 
         * ACE-INSTALL.html:
diff --git a/ace/Thread_Manager.cpp b/ace/Thread_Manager.cpp
index deab37af249..0dacdf7bc55 100644
--- a/ace/Thread_Manager.cpp
+++ b/ace/Thread_Manager.cpp
@@ -126,6 +126,7 @@ ACE_Thread_Descriptor::terminate ()
 
   if (!terminated_)
    {
+     ACE_Log_Msg* log_msg = this->log_msg_;
      terminated_ = 1;
      // Run at_exit hooks
      this->do_at_exit ();
@@ -164,7 +165,6 @@ ACE_Thread_Descriptor::terminate ()
       }
 
      // Check if we need delete ACE_Log_Msg instance
-     ACE_Log_Msg* log_msg = this->log_msg_;
      // If ACE_TSS_cleanup was not executed first log_msg == 0
      if (log_msg == 0)
       {