diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2007-07-23 12:21:34 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2007-07-23 12:21:34 +0000 |
| commit | 8b462a39ca2eed1be2f99171d9e8008dd42a39aa (patch) | |
| tree | af3d5ed5ad6da74c69b546a19c50c8039f6cd90c | |
| parent | 101ac2b9462eba52c97c4f264f80f5a6155bacb3 (diff) | |
| download | ATCD-8b462a39ca2eed1be2f99171d9e8008dd42a39aa.tar.gz | |
Mon Jul 23 12:21:14 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>
| -rw-r--r-- | TAO/ChangeLog | 7 | ||||
| -rw-r--r-- | TAO/tao/Muxed_TMS.cpp | 5 | ||||
| -rw-r--r-- | TAO/tao/Muxed_TMS.h | 3 | ||||
| -rw-r--r-- | TAO/tao/Transport_Mux_Strategy.cpp | 1 | ||||
| -rw-r--r-- | TAO/tao/Transport_Mux_Strategy.h | 3 |
5 files changed, 12 insertions, 7 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 7a614cc9c4b..a076f42971a 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,10 @@ +Mon Jul 23 12:21:14 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl> + + * tao/Muxed_TMS.{h,cpp} + * tao/Transport_Mux_Strategy.{h,cpp}: + Moved lock_ from base to derived class, no need to be in + the base + Mon Jul 23 12:12:14 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl> * tao/Exclusive_TMS.h: diff --git a/TAO/tao/Muxed_TMS.cpp b/TAO/tao/Muxed_TMS.cpp index 1420eb9ff80..43723315271 100644 --- a/TAO/tao/Muxed_TMS.cpp +++ b/TAO/tao/Muxed_TMS.cpp @@ -15,6 +15,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Muxed_TMS::TAO_Muxed_TMS (TAO_Transport *transport) : TAO_Transport_Mux_Strategy (transport) + , lock_ (0) , request_id_generator_ (0) , orb_core_ (transport->orb_core ()) , dispatcher_table_ (this->orb_core_->client_factory ()->reply_dispatcher_table_size ()) @@ -81,9 +82,7 @@ TAO_Muxed_TMS::bind_dispatcher (CORBA::ULong request_id, if (rd == 0) return 0; - int result = - this->dispatcher_table_.bind (request_id, rd); - + int const result = this->dispatcher_table_.bind (request_id, rd); if (result != 0) { diff --git a/TAO/tao/Muxed_TMS.h b/TAO/tao/Muxed_TMS.h index 974fa62ae99..fc4b97491c4 100644 --- a/TAO/tao/Muxed_TMS.h +++ b/TAO/tao/Muxed_TMS.h @@ -69,6 +69,9 @@ public: virtual void connection_closed (void); protected: + /// Lock to protect the state of the object + ACE_Lock *lock_; + /// Used to generate a different request_id on each call to /// request_id(). CORBA::ULong request_id_generator_; diff --git a/TAO/tao/Transport_Mux_Strategy.cpp b/TAO/tao/Transport_Mux_Strategy.cpp index beb04aba840..196d7e6338c 100644 --- a/TAO/tao/Transport_Mux_Strategy.cpp +++ b/TAO/tao/Transport_Mux_Strategy.cpp @@ -12,7 +12,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Transport_Mux_Strategy::TAO_Transport_Mux_Strategy ( TAO_Transport *transport) : transport_ (transport) - , lock_ (0) { } diff --git a/TAO/tao/Transport_Mux_Strategy.h b/TAO/tao/Transport_Mux_Strategy.h index bcf8b9bef96..6f729a1db23 100644 --- a/TAO/tao/Transport_Mux_Strategy.h +++ b/TAO/tao/Transport_Mux_Strategy.h @@ -93,9 +93,6 @@ public: protected: /// Cache the transport reference. TAO_Transport *transport_; - - /// Lock to protect the state of the object - ACE_Lock *lock_; }; TAO_END_VERSIONED_NAMESPACE_DECL |