diff options
| author | schmidt <douglascraigschmidt@users.noreply.github.com> | 2005-04-29 14:30:23 +0000 |
|---|---|---|
| committer | schmidt <douglascraigschmidt@users.noreply.github.com> | 2005-04-29 14:30:23 +0000 |
| commit | 7f5316b80508856ba1cf110382b6c2c378c4184e (patch) | |
| tree | ed59de39060ed90c4e20e44e8df0746b2e3ab151 | |
| parent | bf4ef30e7d7ad09b99718dda6983b2862a24b346 (diff) | |
| download | ATCD-7f5316b80508856ba1cf110382b6c2c378c4184e.tar.gz | |
ChangeLogTag:Fri Apr 29 09:25:28 2005 Douglas C. Schmidt <schmidt@cs.wustl.edu>
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | ace/Thread_Exit.cpp | 4 |
2 files changed, 12 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog index 79a86269e34..444cba3d467 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Fri Apr 29 09:25:28 2005 Douglas C. Schmidt <schmidt@cs.wustl.edu> + + * ace/Thread_Exit.cpp (cleanup): Set ACE_Thread_Manager::thr_exit_ + to 0 to prevent a later crash in + ACE_Thread_Manager::set_thr_exit(). Thanks to D. J. Stacnniak + <djstachniak@yahoo.com> for submitting a fix and Slava Gorelik + <slava.gorelik@sap.com> for reporting the problem. + Fri Apr 29 12:42:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl> * ACE-INSTALL.html: diff --git a/ace/Thread_Exit.cpp b/ace/Thread_Exit.cpp index e934aef6294..160c1e0429c 100644 --- a/ace/Thread_Exit.cpp +++ b/ace/Thread_Exit.cpp @@ -16,6 +16,10 @@ ACE_Thread_Exit::cleanup (void *instance) delete (ACE_TSS_TYPE (ACE_Thread_Exit) *) instance; + // Set the thr_exit_ static to null to keep things from crashing if + // ACE::fini() is enabled here. + ACE_Thread_Manager::thr_exit_ = 0; + ACE_Thread_Exit::is_constructed_ = 0; // All TSS objects have been destroyed. Reset this flag so // ACE_Thread_Exit singleton can be created again. |