summaryrefslogtreecommitdiff
path: root/TAO/tao/default_server.cpp
diff options
context:
space:
mode:
authorirfan <irfan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1999-04-27 22:06:58 +0000
committerirfan <irfan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1999-04-27 22:06:58 +0000
commit2b26b7d572fc15d5b28f416d1899563186dd5e05 (patch)
tree69f1cc139d20e0ad190af7a35cd6e302d17d51ec /TAO/tao/default_server.cpp
parent5760cd190dab2c809fcbe8162aea6ba19bd990ea (diff)
downloadATCD-2b26b7d572fc15d5b28f416d1899563186dd5e05.tar.gz
Tue Apr 27 16:48:24 1999 Irfan Pyarali <irfan@cs.wustl.edu>
Diffstat (limited to 'TAO/tao/default_server.cpp')
-rw-r--r--TAO/tao/default_server.cpp21
1 files changed, 5 insertions, 16 deletions
diff --git a/TAO/tao/default_server.cpp b/TAO/tao/default_server.cpp
index 0238993da40..3eef6e4eda1 100644
--- a/TAO/tao/default_server.cpp
+++ b/TAO/tao/default_server.cpp
@@ -45,28 +45,17 @@ TAO_Default_Server_Strategy_Factory::concurrency_strategy (void)
return this->concurrency_strategy_;
}
-ACE_Lock *
-TAO_Default_Server_Strategy_Factory::create_poa_lock (void)
+int
+TAO_Default_Server_Strategy_Factory::enable_poa_locking (void)
{
- ACE_Lock *the_lock = 0;
-
switch (this->poa_lock_type_)
{
+ case TAO_NULL_LOCK:
+ return 0;
case TAO_THREAD_LOCK:
-#if defined (ACE_HAS_THREADS)
- ACE_NEW_RETURN (the_lock,
- ACE_Lock_Adapter<ACE_Recursive_Thread_Mutex> (),
- 0);
- break;
-#endif /* ACE_HAS_THREADS */
default:
- ACE_NEW_RETURN (the_lock,
- ACE_Lock_Adapter<ACE_Null_Mutex> (),
- 0);
- break;
+ return 1;
}
-
- return the_lock;
}
ACE_Lock *