*** empty log message ***

5 files changed, 68 insertions, 66 deletions

diff --git a/TAO/orbsvcs/orbsvcs/Trader/Attributes.cpp b/TAO/orbsvcs/orbsvcs/Trader/Attributes.cpp
index 863c6b579e5..0745d0b3e7b 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Attributes.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Attributes.cpp
@@ -5,10 +5,9 @@
 #define TAO_ATTRIBUTES_C
 
 #include "Attributes.h"
-#include "Trader.h"
 
-TAO_Support_Attributes_Impl::TAO_Support_Attributes_Impl (TAO_Trader_Base &trader)
-  : trader_ (trader),
+TAO_Support_Attributes_Impl::TAO_Support_Attributes_Impl (TAO_Lockable &locker)
+  : locker_ (locker),
     supports_modifiable_properties_ (CORBA::B_TRUE),
     supports_dynamic_properties_ (CORBA::B_TRUE),
     supports_proxy_offers_ (CORBA::B_FALSE),
@@ -23,7 +22,7 @@ TAO_Support_Attributes_Impl::~TAO_Support_Attributes_Impl (void)
 CORBA::Boolean
 TAO_Support_Attributes_Impl::supports_modifiable_properties (void) const
 {
-  ACE_READ_GUARD_RETURN (ACE_Lock, ace_mon, this->trader_.lock (),
+  ACE_READ_GUARD_RETURN (ACE_Lock, ace_mon, this->locker_.lock (),
 			 CORBA::B_FALSE);
   return this->supports_modifiable_properties_;
 }
@@ -31,14 +30,14 @@ TAO_Support_Attributes_Impl::supports_modifiable_properties (void) const
 void
 TAO_Support_Attributes_Impl::supports_modifiable_properties (CORBA::Boolean new_value)
 {
-  ACE_WRITE_GUARD (ACE_Lock, ace_mon, this->trader_.lock ());  
+  ACE_WRITE_GUARD (ACE_Lock, ace_mon, this->locker_.lock ());  
   this->supports_modifiable_properties_ = new_value;
 }
 
 CORBA::Boolean
 TAO_Support_Attributes_Impl::supports_dynamic_properties (void) const
 {
-  ACE_READ_GUARD_RETURN (ACE_Lock, ace_mon, this->trader_.lock (),
+  ACE_READ_GUARD_RETURN (ACE_Lock, ace_mon, this->locker_.lock (),
 			 CORBA::B_FALSE);
 
   return this->supports_dynamic_properties_;
@@ -47,14 +46,14 @@ TAO_Support_Attributes_Impl::supports_dynamic_properties (void) const
 void
 TAO_Support_Attributes_Impl::supports_dynamic_properties (CORBA::Boolean new_value)
 {
-  ACE_WRITE_GUARD (ACE_Lock, ace_mon, this->trader_.lock ());  
+  ACE_WRITE_GUARD (ACE_Lock, ace_mon, this->locker_.lock ());  
   this->supports_dynamic_properties_ = new_value;
 }
     
 CORBA::Boolean
 TAO_Support_Attributes_Impl::supports_proxy_offers (void) const
 {
-  ACE_READ_GUARD_RETURN (ACE_Lock, ace_mon, this->trader_.lock (),
+  ACE_READ_GUARD_RETURN (ACE_Lock, ace_mon, this->locker_.lock (),
 			 CORBA::B_FALSE);
     
   return this->supports_proxy_offers_;
@@ -63,14 +62,14 @@ TAO_Support_Attributes_Impl::supports_proxy_offers (void) const
 void
 TAO_Support_Attributes_Impl::supports_proxy_offers (CORBA::Boolean new_value)
 {
-  ACE_WRITE_GUARD (ACE_Lock, ace_mon, this->trader_.lock ());  
+  ACE_WRITE_GUARD (ACE_Lock, ace_mon, this->locker_.lock ());  
   this->supports_proxy_offers_ = new_value;
 }
 
 CosTrading::TypeRepository_ptr
 TAO_Support_Attributes_Impl::type_repos (void) const
 {
-  ACE_READ_GUARD_RETURN (ACE_Lock, ace_mon, this->trader_.lock (),
+  ACE_READ_GUARD_RETURN (ACE_Lock, ace_mon, this->locker_.lock (),
 			 CosTrading::TypeRepository::_nil ());
   return this->type_repos_;
 }
@@ -78,13 +77,13 @@ TAO_Support_Attributes_Impl::type_repos (void) const
 void
 TAO_Support_Attributes_Impl::type_repos (CosTrading::TypeRepository_ptr new_value)
 {
-  ACE_WRITE_GUARD (ACE_Lock, ace_mon, this->trader_.lock ());  
+  ACE_WRITE_GUARD (ACE_Lock, ace_mon, this->locker_.lock ());  
   this->type_repos_ = new_value;
 }
   
 
-TAO_Import_Attributes_Impl::TAO_Import_Attributes_Impl (TAO_Trader_Base &trader)
-  : trader_ (trader),
+TAO_Import_Attributes_Impl::TAO_Import_Attributes_Impl (TAO_Lockable &locker)
+  : locker_ (locker),
     def_search_card_ (10),
     max_search_card_ (100),
     def_match_card_ (10),
@@ -107,14 +106,14 @@ TAO_Import_Attributes_Impl::~TAO_Import_Attributes_Impl (void)
 CORBA::ULong
 TAO_Import_Attributes_Impl::def_search_card (void) const
 {
-  ACE_READ_GUARD_RETURN (ACE_Lock, ace_mon, this->trader_.lock (), 10);
+  ACE_READ_GUARD_RETURN (ACE_Lock, ace_mon, this->locker_.lock (), 10);
   return this->def_search_card_;
 }
 
 void
 TAO_Import_Attributes_Impl::def_search_card (CORBA::ULong new_value)
 {
-  ACE_WRITE_GUARD (ACE_Lock, ace_mon, this->trader_.lock ());
+  ACE_WRITE_GUARD (ACE_Lock, ace_mon, this->locker_.lock ());
 
   if (new_value > this->max_search_card_)
     this->def_search_card_ = this->max_search_card_;
@@ -125,14 +124,14 @@ TAO_Import_Attributes_Impl::def_search_card (CORBA::ULong new_value)
 CORBA::ULong
 TAO_Import_Attributes_Impl::max_search_card (void) const
 {
-  ACE_READ_GUARD_RETURN (ACE_Lock, ace_mon, this->trader_.lock (), 10);
+  ACE_READ_GUARD_RETURN (ACE_Lock, ace_mon, this->locker_.lock (), 10);
   return this->max_search_card_;
 }
 
 void
 TAO_Import_Attributes_Impl::max_search_card (CORBA::ULong new_value)
 {
-  ACE_WRITE_GUARD (ACE_Lock, ace_mon, this->trader_.lock ());
+  ACE_WRITE_GUARD (ACE_Lock, ace_mon, this->locker_.lock ());
 
   this->max_search_card_ = new_value;
 
@@ -143,14 +142,14 @@ TAO_Import_Attributes_Impl::max_search_card (CORBA::ULong new_value)
 CORBA::ULong
 TAO_Import_Attributes_Impl::def_match_card (void) const
 {
-  ACE_READ_GUARD_RETURN (ACE_Lock, ace_mon, this->trader_.lock (), 10);
+  ACE_READ_GUARD_RETURN (ACE_Lock, ace_mon, this->locker_.lock (), 10);
   return this->def_match_card_;
 }
 
 void
 TAO_Import_Attributes_Impl::def_match_card (CORBA::ULong new_value)
 {
-  ACE_WRITE_GUARD (ACE_Lock, ace_mon, this->trader_.lock ());
+  ACE_WRITE_GUARD (ACE_Lock, ace_mon, this->locker_.lock ());
 
   if (new_value > this->max_match_card_)
     this->def_match_card_ = this->max_match_card_;
@@ -161,14 +160,14 @@ TAO_Import_Attributes_Impl::def_match_card (CORBA::ULong new_value)
 CORBA::ULong
 TAO_Import_Attributes_Impl::max_match_card (void) const
 {
-  ACE_READ_GUARD_RETURN (ACE_Lock, ace_mon, this->trader_.lock (), 10);
+  ACE_READ_GUARD_RETURN (ACE_Lock, ace_mon, this->locker_.lock (), 10);
   return this->max_match_card_;
 }
 
 void
 TAO_Import_Attributes_Impl::max_match_card (CORBA::ULong new_value)
 {
-  ACE_WRITE_GUARD (ACE_Lock, ace_mon, this->trader_.lock ());  
+  ACE_WRITE_GUARD (ACE_Lock, ace_mon, this->locker_.lock ());  
   this->max_match_card_ = new_value;
 
   if (this->def_match_card_ > this->max_match_card_)
@@ -178,14 +177,14 @@ TAO_Import_Attributes_Impl::max_match_card (CORBA::ULong new_value)
 CORBA::ULong
 TAO_Import_Attributes_Impl::def_return_card (void) const
 {
-  ACE_READ_GUARD_RETURN (ACE_Lock, ace_mon, this->trader_.lock (), 10);
+  ACE_READ_GUARD_RETURN (ACE_Lock, ace_mon, this->locker_.lock (), 10);
   return this->def_return_card_;
 }
 
 void
 TAO_Import_Attributes_Impl::def_return_card (CORBA::ULong new_value)
 {  
-  ACE_WRITE_GUARD (ACE_Lock, ace_mon, this->trader_.lock ());
+  ACE_WRITE_GUARD (ACE_Lock, ace_mon, this->locker_.lock ());
 
   if (new_value > this->max_return_card_)
     this->def_return_card_ = this->max_return_card_;
@@ -196,14 +195,14 @@ TAO_Import_Attributes_Impl::def_return_card (CORBA::ULong new_value)
 CORBA::ULong
 TAO_Import_Attributes_Impl::max_return_card (void) const
 {
-  ACE_READ_GUARD_RETURN (ACE_Lock, ace_mon, this->trader_.lock (), 10); 
+  ACE_READ_GUARD_RETURN (ACE_Lock, ace_mon, this->locker_.lock (), 10); 
   return this->max_return_card_;
 }
 
 void
 TAO_Import_Attributes_Impl::max_return_card (CORBA::ULong new_value)
 {
-  ACE_WRITE_GUARD (ACE_Lock, ace_mon, this->trader_.lock ());  
+  ACE_WRITE_GUARD (ACE_Lock, ace_mon, this->locker_.lock ());  
   this->max_return_card_ = new_value;
 
   if (this->def_return_card_ > this->max_return_card_)
@@ -213,28 +212,28 @@ TAO_Import_Attributes_Impl::max_return_card (CORBA::ULong new_value)
 CORBA::ULong
 TAO_Import_Attributes_Impl::max_list (void) const
 {
-  ACE_READ_GUARD_RETURN (ACE_Lock, ace_mon, this->trader_.lock (), 0); 
+  ACE_READ_GUARD_RETURN (ACE_Lock, ace_mon, this->locker_.lock (), 0); 
   return this->max_list_;
 }
 
 void
 TAO_Import_Attributes_Impl::max_list (CORBA::ULong new_value)
 {
-  ACE_WRITE_GUARD (ACE_Lock, ace_mon, this->trader_.lock ());  
+  ACE_WRITE_GUARD (ACE_Lock, ace_mon, this->locker_.lock ());  
   this->max_list_ = new_value;
 }
 
 CORBA::ULong
 TAO_Import_Attributes_Impl::def_hop_count (void) const
 {
-  ACE_READ_GUARD_RETURN (ACE_Lock, ace_mon, this->trader_.lock (), 0);  
+  ACE_READ_GUARD_RETURN (ACE_Lock, ace_mon, this->locker_.lock (), 0);  
   return this->def_hop_count_;
 }
 
 void
 TAO_Import_Attributes_Impl::def_hop_count (CORBA::ULong new_value)
 {
-  ACE_WRITE_GUARD (ACE_Lock, ace_mon, this->trader_.lock ());
+  ACE_WRITE_GUARD (ACE_Lock, ace_mon, this->locker_.lock ());
 
   if (new_value > this->max_hop_count_)
     this->def_hop_count_ = this->max_hop_count_;
@@ -245,14 +244,14 @@ TAO_Import_Attributes_Impl::def_hop_count (CORBA::ULong new_value)
 CORBA::ULong
 TAO_Import_Attributes_Impl::max_hop_count (void) const
 {
-  ACE_READ_GUARD_RETURN (ACE_Lock, ace_mon, this->trader_.lock (), 0);  
+  ACE_READ_GUARD_RETURN (ACE_Lock, ace_mon, this->locker_.lock (), 0);  
   return this->max_hop_count_;
 }
 
 void
 TAO_Import_Attributes_Impl::max_hop_count (CORBA::ULong new_value)
 {
-  ACE_WRITE_GUARD (ACE_Lock, ace_mon, this->trader_.lock ());  
+  ACE_WRITE_GUARD (ACE_Lock, ace_mon, this->locker_.lock ());  
   this->max_hop_count_ = new_value;
 
   if (this->def_hop_count_ > this->max_hop_count_)
@@ -262,14 +261,14 @@ TAO_Import_Attributes_Impl::max_hop_count (CORBA::ULong new_value)
 CosTrading::FollowOption
 TAO_Import_Attributes_Impl::def_follow_policy (void) const
 {
-  ACE_READ_GUARD_RETURN (ACE_Lock, ace_mon, this->trader_.lock (), CosTrading::local_only); 
+  ACE_READ_GUARD_RETURN (ACE_Lock, ace_mon, this->locker_.lock (), CosTrading::local_only); 
   return this->def_follow_policy_;
 }
 
 void
 TAO_Import_Attributes_Impl::def_follow_policy (CosTrading::FollowOption new_value)
 {
-  ACE_WRITE_GUARD (ACE_Lock, ace_mon, this->trader_.lock ());
+  ACE_WRITE_GUARD (ACE_Lock, ace_mon, this->locker_.lock ());
 
   if (new_value > this->max_follow_policy_)
     this->def_follow_policy_ = this->max_follow_policy_;
@@ -280,14 +279,14 @@ TAO_Import_Attributes_Impl::def_follow_policy (CosTrading::FollowOption new_valu
 CosTrading::FollowOption
 TAO_Import_Attributes_Impl::max_follow_policy (void) const
 {
-  ACE_READ_GUARD_RETURN (ACE_Lock, ace_mon, this->trader_.lock (), CosTrading::local_only); 
+  ACE_READ_GUARD_RETURN (ACE_Lock, ace_mon, this->locker_.lock (), CosTrading::local_only); 
   return this->max_follow_policy_;
 }
 
 void
 TAO_Import_Attributes_Impl::max_follow_policy (CosTrading::FollowOption new_value)
 {
-  ACE_WRITE_GUARD (ACE_Lock, ace_mon, this->trader_.lock ());  
+  ACE_WRITE_GUARD (ACE_Lock, ace_mon, this->locker_.lock ());  
   this->max_follow_policy_ = new_value;
 
   if (this->def_follow_policy_ > this->max_follow_policy_)
@@ -295,8 +294,8 @@ TAO_Import_Attributes_Impl::max_follow_policy (CosTrading::FollowOption new_valu
 }
 
 
-TAO_Trading_Components_Impl::TAO_Trading_Components_Impl (TAO_Trader_Base &trader)
-  : trader_ (trader),
+TAO_Trading_Components_Impl::TAO_Trading_Components_Impl (TAO_Lockable &locker)
+  : locker_ (locker),
     lookup_ (CosTrading::Lookup::_nil ()),
     register_ (CosTrading::Register::_nil ()),
     link_ (CosTrading::Link::_nil ()),
@@ -312,7 +311,7 @@ TAO_Trading_Components_Impl::~TAO_Trading_Components_Impl (void)
 CosTrading::Lookup_ptr
 TAO_Trading_Components_Impl::lookup_if (void) const
 {
-  ACE_READ_GUARD_RETURN (ACE_Lock, ace_mon, this->trader_.lock (),
+  ACE_READ_GUARD_RETURN (ACE_Lock, ace_mon, this->locker_.lock (),
 			 CosTrading::Lookup::_nil ());  
   return this->lookup_;
 }
@@ -320,14 +319,14 @@ TAO_Trading_Components_Impl::lookup_if (void) const
 void
 TAO_Trading_Components_Impl::lookup_if (CosTrading::Lookup_ptr new_value)
 {
-  ACE_WRITE_GUARD (ACE_Lock, ace_mon, this->trader_.lock ());  
+  ACE_WRITE_GUARD (ACE_Lock, ace_mon, this->locker_.lock ());  
   this->lookup_ = new_value;
 }
 
 CosTrading::Register_ptr
 TAO_Trading_Components_Impl::register_if (void) const
 {
-  ACE_READ_GUARD_RETURN (ACE_Lock, ace_mon, this->trader_.lock (),
+  ACE_READ_GUARD_RETURN (ACE_Lock, ace_mon, this->locker_.lock (),
 			 CosTrading::Register::_nil ());  
   return this->register_;
 }
@@ -335,14 +334,14 @@ TAO_Trading_Components_Impl::register_if (void) const
 void
 TAO_Trading_Components_Impl::register_if (CosTrading::Register_ptr new_value)
 {
-  ACE_WRITE_GUARD (ACE_Lock, ace_mon, this->trader_.lock ());  
+  ACE_WRITE_GUARD (ACE_Lock, ace_mon, this->locker_.lock ());  
   this->register_ = new_value;
 }
 
 CosTrading::Link_ptr
 TAO_Trading_Components_Impl::link_if (void) const
 {
-  ACE_READ_GUARD_RETURN (ACE_Lock, ace_mon, this->trader_.lock (),
+  ACE_READ_GUARD_RETURN (ACE_Lock, ace_mon, this->locker_.lock (),
 			 CosTrading::Link::_nil ());  
   return this->link_;
 }
@@ -350,14 +349,14 @@ TAO_Trading_Components_Impl::link_if (void) const
 void
 TAO_Trading_Components_Impl::link_if (CosTrading::Link_ptr new_value)
 {
-  ACE_WRITE_GUARD (ACE_Lock, ace_mon, this->trader_.lock ());  
+  ACE_WRITE_GUARD (ACE_Lock, ace_mon, this->locker_.lock ());  
   this->link_ = new_value;
 }
 
 CosTrading::Proxy_ptr
 TAO_Trading_Components_Impl::proxy_if (void) const
 {
-  ACE_READ_GUARD_RETURN (ACE_Lock, ace_mon, this->trader_.lock (),
+  ACE_READ_GUARD_RETURN (ACE_Lock, ace_mon, this->locker_.lock (),
 			 CosTrading::Proxy::_nil ());  
   return this->proxy_;
 }
@@ -365,14 +364,14 @@ TAO_Trading_Components_Impl::proxy_if (void) const
 void
 TAO_Trading_Components_Impl::proxy_if (CosTrading::Proxy_ptr new_value)
 {
-  ACE_WRITE_GUARD (ACE_Lock, ace_mon, this->trader_.lock ());  
+  ACE_WRITE_GUARD (ACE_Lock, ace_mon, this->locker_.lock ());  
   this->proxy_ = new_value;
 }
   
 CosTrading::Admin_ptr
 TAO_Trading_Components_Impl::admin_if (void) const
 {
-  ACE_READ_GUARD_RETURN (ACE_Lock, ace_mon, this->trader_.lock (),
+  ACE_READ_GUARD_RETURN (ACE_Lock, ace_mon, this->locker_.lock (),
 			 CosTrading::Admin::_nil ());  
   return this->admin_;
 }
@@ -380,13 +379,13 @@ TAO_Trading_Components_Impl::admin_if (void) const
 void
 TAO_Trading_Components_Impl::admin_if (CosTrading::Admin_ptr new_value)
 {
-  ACE_WRITE_GUARD (ACE_Lock, ace_mon, this->trader_.lock ());  
+  ACE_WRITE_GUARD (ACE_Lock, ace_mon, this->locker_.lock ());  
   this->admin_ = new_value;
 }
 
   
-TAO_Link_Attributes_Impl::TAO_Link_Attributes_Impl (TAO_Trader_Base &trader)
-  :trader_ (trader),
+TAO_Link_Attributes_Impl::TAO_Link_Attributes_Impl (TAO_Lockable &locker)
+  :locker_ (locker),
    max_link_follow_policy_ (CosTrading::local_only)
 {
 }
@@ -398,7 +397,7 @@ TAO_Link_Attributes_Impl::~TAO_Link_Attributes_Impl (void)
 CosTrading::FollowOption 
 TAO_Link_Attributes_Impl::max_link_follow_policy (void) const
 {
-  ACE_READ_GUARD_RETURN (ACE_Lock, ace_mon, this->trader_.lock (),
+  ACE_READ_GUARD_RETURN (ACE_Lock, ace_mon, this->locker_.lock (),
 			 CosTrading::local_only);  
   return this->max_link_follow_policy_;
 }
@@ -406,7 +405,7 @@ TAO_Link_Attributes_Impl::max_link_follow_policy (void) const
 void  
 TAO_Link_Attributes_Impl::max_link_follow_policy (CosTrading::FollowOption new_value)
 {
-  ACE_WRITE_GUARD (ACE_Lock, ace_mon, this->trader_.lock ());  
+  ACE_WRITE_GUARD (ACE_Lock, ace_mon, this->locker_.lock ());  
   this->max_link_follow_policy_ = new_value;
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Attributes.h b/TAO/orbsvcs/orbsvcs/Trader/Attributes.h
index 68e71880d72..81ee772cc08 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Attributes.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Attributes.h
@@ -20,8 +20,7 @@
 #define TAO_ATTRIBUTES_H
 
 #include "orbsvcs/CosTradingS.h"
-
-class TAO_Trader_Base;
+#include "Monitor.h"
  
 class TAO_Export TAO_Support_Attributes_Impl
   // = TITLE
@@ -34,7 +33,7 @@ class TAO_Export TAO_Support_Attributes_Impl
 {
 public:
   // = Initialization and termination methods.
-  TAO_Support_Attributes_Impl (TAO_Trader_Base &trader);
+  TAO_Support_Attributes_Impl (TAO_Lockable &locker);
   ~TAO_Support_Attributes_Impl ();
 
   // = Accessor methods.
@@ -52,7 +51,7 @@ public:
 
 private:
 
-  TAO_Trader_Base &trader_;
+  TAO_Lockable &locker_;
   // A reference to the trader (needed for obtaining the lock.)
 
   CORBA::Boolean supports_modifiable_properties_;
@@ -80,7 +79,7 @@ class TAO_Export TAO_Link_Attributes_Impl
 public:
   // = Initialization and termination methods.
 
-  TAO_Link_Attributes_Impl (TAO_Trader_Base &trader);
+  TAO_Link_Attributes_Impl (TAO_Lockable &locker);
   ~TAO_Link_Attributes_Impl ();
 
   // = Accessor methods.
@@ -90,7 +89,7 @@ public:
 
 private:
 
-  TAO_Trader_Base &trader_;
+  TAO_Lockable &locker_;
   // A reference to the trader (needed for obtaining the lock.)
 
   CosTrading::FollowOption max_link_follow_policy_;
@@ -109,7 +108,7 @@ class TAO_Export TAO_Import_Attributes_Impl
 public:
   // = Initialization and termination methods.
 
-  TAO_Import_Attributes_Impl (TAO_Trader_Base &trader);
+  TAO_Import_Attributes_Impl (TAO_Lockable &locker);
 
   ~TAO_Import_Attributes_Impl (void);
 
@@ -150,7 +149,7 @@ public:
 
 private:
 
-  TAO_Trader_Base &trader_;
+  TAO_Lockable &locker_;
 
   CORBA::ULong def_search_card_;
   // Upper bound of offers to be searched if <search_card>
@@ -206,7 +205,7 @@ class TAO_Export TAO_Trading_Components_Impl
 public:
 
   // = Initialization and termination methods.
-  TAO_Trading_Components_Impl (TAO_Trader_Base &trader);
+  TAO_Trading_Components_Impl (TAO_Lockable &locker);
   ~TAO_Trading_Components_Impl (void);
 
   // = CosTrading::TraderComponents methods. 
@@ -248,7 +247,7 @@ public:
 
 private:
 
-  TAO_Trader_Base &trader_;
+  TAO_Lockable &locker_;
 
   CosTrading::Lookup_var lookup_;
   CosTrading::Register_var register_;
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Monitor.h b/TAO/orbsvcs/orbsvcs/Trader/Monitor.h
index 21741ca7bda..8ae7e244749 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Monitor.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Monitor.h
@@ -17,6 +17,13 @@
 #ifndef TAO_MONITOR_H
 #define TAO_MONITOR_H
 
+class TAO_Lockable
+{
+public:
+
+  virtual ACE_Lock& lock (void) = 0;
+};
+
 template <class TYPE, class TAO_LOCK>
 class TAO_Monitor : public TYPE
 {
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trader.cpp
index 2cc12c4ffa7..9f18a49ca6b 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader.cpp
@@ -20,7 +20,6 @@
 #include "ace/OS.h"
 #include <iostream.h>
 
-
 TAO_Trader_Base::TAO_Trader_Base (void)
   : trading_components_ (*this),
     import_attributes_ (*this),
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader.h b/TAO/orbsvcs/orbsvcs/Trader/Trader.h
index 44386d20ae3..616da5a0c5d 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader.h
@@ -21,6 +21,7 @@
 
 #include "stl.h"
 #include "Attributes.h"
+#include "Monitor.h"
 
 typedef CosTradingRepos::ServiceTypeRepository SERVICE_TYPE_REPOS;
 
@@ -43,7 +44,7 @@ public:
 #endif /* ACE_HAS_THREADS */
 };
 
-class TAO_Export TAO_Trader_Base
+class TAO_Export TAO_Trader_Base : public TAO_Lockable
   //
   // = TITLE
   //     TAO_Trader inherits from this "helper" class.
@@ -83,9 +84,6 @@ public:
 
   // = Accessor for trader's lock.
 
-  virtual ACE_Lock &lock (void) = 0;
-  // return lock that guards trader's current configuration.
-
   static CORBA::Boolean is_valid_identifier_name (const char* ident);
   // Determine whether the identifier is a valid one (i.e., if the
   // first character is a letter, and the subsequent ones letter,