diff options
| author | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-07-04 19:48:57 +0000 |
|---|---|---|
| committer | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-07-04 19:48:57 +0000 |
| commit | bb7b511c518387c893fcceb058a4ac8d6466d650 (patch) | |
| tree | f8cb6b23253ddc29cd050217feb84e6de581553b /TAO/tao/default_client.cpp | |
| parent | 3c966a4eef30f460df3a2594983e825821522ad3 (diff) | |
| download | ATCD-bb7b511c518387c893fcceb058a4ac8d6466d650.tar.gz | |
ChangeLogTag:Sun Jul 4 14:43:02 1999 Carlos O'Ryan <coryan@cs.wustl.edu>
Diffstat (limited to 'TAO/tao/default_client.cpp')
| -rw-r--r-- | TAO/tao/default_client.cpp | 35 |
1 files changed, 28 insertions, 7 deletions
diff --git a/TAO/tao/default_client.cpp b/TAO/tao/default_client.cpp index 022e915d6a5..18e327e16aa 100644 --- a/TAO/tao/default_client.cpp +++ b/TAO/tao/default_client.cpp @@ -12,7 +12,7 @@ ACE_RCSID(tao, default_client, "$Id$") TAO_Default_Client_Strategy_Factory::TAO_Default_Client_Strategy_Factory (void) - : iiop_profile_lock_type_ (TAO_THREAD_LOCK) + : profile_lock_type_ (TAO_THREAD_LOCK) { // Use single thread client connection handler #if defined (TAO_USE_ST_CLIENT_CONNECTION_HANDLER) @@ -56,7 +56,7 @@ TAO_Default_Client_Strategy_Factory::parse_args (int argc, char ** argv) for (curarg = 0; curarg < argc && argv[curarg]; curarg++) { if (ACE_OS::strcasecmp (argv[curarg], - "-ORBIIOPProfileLock") == 0) + "-ORBProfileLock") == 0) { curarg++; if (curarg < argc) @@ -65,14 +65,35 @@ TAO_Default_Client_Strategy_Factory::parse_args (int argc, char ** argv) if (ACE_OS::strcasecmp (name, "thread") == 0) - this->iiop_profile_lock_type_ = TAO_THREAD_LOCK; + this->profile_lock_type_ = TAO_THREAD_LOCK; else if (ACE_OS::strcasecmp (name, "null") == 0) - this->iiop_profile_lock_type_ = TAO_NULL_LOCK; + this->profile_lock_type_ = TAO_NULL_LOCK; } } else if (ACE_OS::strcasecmp (argv[curarg], + "-ORBIIOPProfileLock") == 0) + { + ACE_DEBUG ((LM_DEBUG, + "WARNING: The -ORBIIOPProfileLock option" + " is deprecated and will be removed.\n" + " Please use -ORBProfileLock instead\n")); + curarg++; + if (curarg < argc) + { + char *name = argv[curarg]; + + if (ACE_OS::strcasecmp (name, + "thread") == 0) + this->profile_lock_type_ = TAO_THREAD_LOCK; + else if (ACE_OS::strcasecmp (name, + "null") == 0) + this->profile_lock_type_ = TAO_NULL_LOCK; + } + } + + else if (ACE_OS::strcasecmp (argv[curarg], "-ORBClientConnectionHandler") == 0) { curarg++; @@ -112,11 +133,11 @@ TAO_Default_Client_Strategy_Factory::parse_args (int argc, char ** argv) } ACE_Lock * -TAO_Default_Client_Strategy_Factory::create_iiop_profile_lock (void) +TAO_Default_Client_Strategy_Factory::create_profile_lock (void) { ACE_Lock *the_lock = 0; - if (this->iiop_profile_lock_type_ == TAO_NULL_LOCK) + if (this->profile_lock_type_ == TAO_NULL_LOCK) ACE_NEW_RETURN (the_lock, ACE_Lock_Adapter<ACE_SYNCH_NULL_MUTEX> (), 0); @@ -129,7 +150,7 @@ TAO_Default_Client_Strategy_Factory::create_iiop_profile_lock (void) } // @@ Alex: implement the WS and TMS methods here, similar to the -// create_iiop_profile_lock above... +// create_profile_lock above... // @@ Alex: remember your idea of using the // -ORBclientconnectionhandler option to implement the WS factory, // but you need new options for the TMS... |