summaryrefslogtreecommitdiff
path: root/ACE/ace/Log_Msg.cpp
diff options
context:
space:
mode:
authorAdam Mitz <mitza@ociweb.com>2015-11-11 16:15:52 -0600
committerAdam Mitz <mitza@ociweb.com>2015-11-11 16:15:52 -0600
commit74f5d92308ff3d0ae6012b2e4e4d3986c8ff5e8d (patch)
treeebdcdf336ac24ab877022fbb88268640ebd1b231 /ACE/ace/Log_Msg.cpp
parent6226b0eec95959b716a46120699d6357a20dad70 (diff)
downloadATCD-74f5d92308ff3d0ae6012b2e4e4d3986c8ff5e8d.tar.gz
LynxOS-178 has some issues in its thread specific storage.
Diffstat (limited to 'ACE/ace/Log_Msg.cpp')
-rw-r--r--ACE/ace/Log_Msg.cpp15
1 files changed, 9 insertions, 6 deletions
diff --git a/ACE/ace/Log_Msg.cpp b/ACE/ace/Log_Msg.cpp
index 4b19f872e8c..03bc08fec39 100644
--- a/ACE/ace/Log_Msg.cpp
+++ b/ACE/ace/Log_Msg.cpp
@@ -243,12 +243,15 @@ LOCAL_EXTERN_PREFIX
void
ACE_TSS_CLEANUP_NAME (void *ptr)
{
- // Delegate to thr_desc if this not has terminated
- ACE_Log_Msg* log_msg = (ACE_Log_Msg*) ptr;
- if (log_msg->thr_desc()!=0)
- log_msg->thr_desc()->log_msg_cleanup(log_msg);
- else
- delete log_msg;
+ if (ptr != 0)
+ {
+ // Delegate to thr_desc if this not has terminated
+ ACE_Log_Msg *log_msg = (ACE_Log_Msg *) ptr;
+ if (log_msg->thr_desc () != 0)
+ log_msg->thr_desc ()->log_msg_cleanup (log_msg);
+ else
+ delete log_msg;
+ }
}
# endif /* ACE_HAS_THREAD_SPECIFIC_STORAGE || ACE_HAS_TSS_EMULATION */
#endif /* ! ACE_MT_SAFE */