summaryrefslogtreecommitdiff
path: root/ace/Reactor.cpp
diff options
context:
space:
mode:
authornw1 <nw1@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1997-08-01 22:21:16 +0000
committernw1 <nw1@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1997-08-01 22:21:16 +0000
commit3f4b17000984171e5fbb7f36289b9ca1ae9131fd (patch)
treec9068311707f944ea43be02752b3fc20aae8a926 /ace/Reactor.cpp
parent4715ca60ace8e7b86b992491535916919c9590bb (diff)
downloadATCD-3f4b17000984171e5fbb7f36289b9ca1ae9131fd.tar.gz
Changed the lock held by ACE_Static_Object_Lock from ACE_Thread_Mutex to ACE_Recurssive_Thread_Mutex.
Diffstat (limited to 'ace/Reactor.cpp')
-rw-r--r--ace/Reactor.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/ace/Reactor.cpp b/ace/Reactor.cpp
index c238a67f69e..405cd53c53e 100644
--- a/ace/Reactor.cpp
+++ b/ace/Reactor.cpp
@@ -910,7 +910,7 @@ ACE_Reactor::instance (size_t size /* = ACE_Reactor::DEFAULT_SIZE */)
if (ACE_Reactor::reactor_ == 0)
{
// Perform Double-Checked Locking Optimization.
- ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon,
+ ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon,
*ACE_Static_Object_Lock::instance (), 0));
if (ACE_Reactor::reactor_ == 0)
@@ -927,7 +927,7 @@ ACE_Reactor::instance (ACE_Reactor *r)
{
ACE_TRACE ("ACE_Reactor::instance");
- ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon,
+ ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon,
*ACE_Static_Object_Lock::instance (), 0));
ACE_Reactor *t = ACE_Reactor::reactor_;
// We can't safely delete it since we don't know who created it!
@@ -942,7 +942,7 @@ ACE_Reactor::close_singleton (void)
{
ACE_TRACE ("ACE_Reactor::close_singleton");
- ACE_MT (ACE_GUARD (ACE_Thread_Mutex, ace_mon,
+ ACE_MT (ACE_GUARD (ACE_Recursive_Thread_Mutex, ace_mon,
*ACE_Static_Object_Lock::instance ()));
if (ACE_Reactor::delete_reactor_)