diff options
| author | bala <bala@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-10-21 02:56:17 +0000 |
|---|---|---|
| committer | bala <bala@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-10-21 02:56:17 +0000 |
| commit | 7ab6dd6d95abfc04e11fd89ecc6b32d9ea0d82c0 (patch) | |
| tree | 8df136339b62d5cd40be4f5c08eba4ca744b99e6 | |
| parent | 8936e62b76fff52cca3dabd822a0476b628fdf24 (diff) | |
| download | ATCD-7ab6dd6d95abfc04e11fd89ecc6b32d9ea0d82c0.tar.gz | |
ChangeLogTag: Fri Oct 20 21:54:58 2000 Balachandran Natarajan <bala@cs.wustl.edu>
| -rw-r--r-- | TAO/ChangeLogs/ChangeLog-02a | 4 | ||||
| -rw-r--r-- | TAO/tao/default_client.cpp | 11 |
2 files changed, 7 insertions, 8 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index e0da68556ca..e0b254acb26 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,3 +1,7 @@ +Fri Oct 20 21:54:58 2000 Balachandran Natarajan <bala@cs.wustl.edu> + + * tao/default_client.cpp: Fixed a cut and paste error. + Fri Oct 20 12:01:42 2000 Priyanka Gontla <pgontla@ece.uci.edu> * tao/Exception.cpp: diff --git a/TAO/tao/default_client.cpp b/TAO/tao/default_client.cpp index e0e71f168c7..f8dd5e95385 100644 --- a/TAO/tao/default_client.cpp +++ b/TAO/tao/default_client.cpp @@ -233,14 +233,9 @@ TAO_Default_Client_Strategy_Factory::create_ft_service_retention_id_lock (void) { ACE_Lock *the_lock = 0; - if (this->cached_connector_lock_type_ == TAO_NULL_LOCK) - ACE_NEW_RETURN (the_lock, - ACE_Lock_Adapter<ACE_SYNCH_NULL_MUTEX>, - 0); - else - ACE_NEW_RETURN (the_lock, - ACE_Lock_Adapter<ACE_SYNCH_MUTEX>, - 0); + ACE_NEW_RETURN (the_lock, + ACE_Lock_Adapter<ACE_SYNCH_MUTEX>, + 0); return the_lock; } |