diff options
| author | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-07-14 18:38:49 +0000 |
|---|---|---|
| committer | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-07-14 18:38:49 +0000 |
| commit | 87aef3e03d0461e659d17d0d9f67b8bbac5e4f8a (patch) | |
| tree | 2021b8f8dfcaddf5d01394b0d0cc4b00691c2370 /TAO/orbsvcs/IFR_Service/Repository_i.cpp | |
| parent | 915a2d0f1788483a2dfa347a96e52c5162bf2362 (diff) | |
| download | ATCD-87aef3e03d0461e659d17d0d9f67b8bbac5e4f8a.tar.gz | |
Fixed up errors from last night's checkin, and added locking option
to Options instance.
Diffstat (limited to 'TAO/orbsvcs/IFR_Service/Repository_i.cpp')
| -rw-r--r-- | TAO/orbsvcs/IFR_Service/Repository_i.cpp | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/TAO/orbsvcs/IFR_Service/Repository_i.cpp b/TAO/orbsvcs/IFR_Service/Repository_i.cpp index a77b89494af..346d1d86dfb 100644 --- a/TAO/orbsvcs/IFR_Service/Repository_i.cpp +++ b/TAO/orbsvcs/IFR_Service/Repository_i.cpp @@ -4,6 +4,7 @@ #include "Repository_i.h" #include "IDLType_i.h" #include "ExceptionDef_i.h" +#include "Options.h" #include "Servant_Factory.h" #include "ace/Auto_Ptr.h" @@ -18,12 +19,11 @@ TAO_Repository_i::TAO_Repository_i (CORBA::ORB_ptr orb, ir_poa_ (poa), config_ (config), servant_factory_ (0), - extension_ (CORBA::string_dup ("TAO_IFR_name_extension")) + extension_ (CORBA::string_dup ("TAO_IFR_name_extension")), lock_ (0) { -#if defined (ACE_HAS_THREADS) - if (1) //enable_locking + if (OPTIONS::instance ()->enable_locking ()) { ACE_NEW (this->lock_, ACE_Lock_Adapter<ACE_SYNCH_MUTEX> ()); @@ -34,13 +34,6 @@ TAO_Repository_i::TAO_Repository_i (CORBA::ORB_ptr orb, ACE_Lock_Adapter<ACE_SYNCH_NULL_MUTEX> ()); } -#else - - ACE_NEW (this->lock_, - ACE_Lock_Adapter<ACE_SYNCH_NULL_MUTEX> ()); - -#endif /* ACE_HAS_THREADS */ - ACE_TRY_NEW_ENV { ACE_NEW_THROW_EX (this->servant_factory_, |