*** empty log message ***

28 files changed, 13 insertions, 306 deletions

diff --git a/TAO/orbsvcs/Trading_Service/Makefile b/TAO/orbsvcs/Trading_Service/Makefile
index 26ff9c362eb..e291949d434 100644
--- a/TAO/orbsvcs/Trading_Service/Makefile
+++ b/TAO/orbsvcs/Trading_Service/Makefile
@@ -73,8 +73,7 @@ endif
 
 DCFLAGS = -g
 LDFLAGS += -L$(TAO_ROOT)/orbsvcs/orbsvcs -L$(TAO_ROOT)/tao
-CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) -I$(TAO_ROOT)/tao/compat $(TSS_ORB_FLAG) \
-	    -DTAO_HAS_DYNAMIC_PROPERTY_BUG
+CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) -I$(TAO_ROOT)/tao/compat $(TSS_ORB_FLAG)
 
 # DO NOT DELETE THIS LINE -- g++dep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
diff --git a/TAO/orbsvcs/Trading_Service/trader.cpp b/TAO/orbsvcs/Trading_Service/trader.cpp
index 5db262fafaa..4125993570b 100644
--- a/TAO/orbsvcs/Trading_Service/trader.cpp
+++ b/TAO/orbsvcs/Trading_Service/trader.cpp
@@ -47,15 +47,8 @@ main(int argc, char * const *argv)
 
       // Create a Service Type Repository and a Trader Object.
       TAO_Service_Type_Repository type_repos;
-
-#if defined TAO_HAS_DYNAMIC_PROPERTY_BUG
-      auto_ptr<TAO_Trader_Factory::TAO_TRADER> trader =
-	TAO_Trader_Factory::create_linked_trader (orb.ptr ());      
-#else
       auto_ptr<TAO_Trader_Factory::TAO_TRADER> trader =
-	TAO_Trader_Factory::create_linked_trader ();
-#endif /* TAO_HAS_DYNAMIC_PROPERTY_BUG */
-      
+	TAO_Trader_Factory::create_linked_trader ();      
       TAO_Support_Attributes_Impl& sup_attr = trader->support_attributes ();
       TAO_Trading_Components_Impl& trd_comp = trader->trading_components ();
 
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Evaluator.cpp b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Evaluator.cpp
index 90b3952477b..ebec68e5558 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Evaluator.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Evaluator.cpp
@@ -21,19 +21,10 @@
 
 #include "Constraint_Evaluator.h"
 
-#if defined TAO_HAS_DYNAMIC_PROPERTY_BUG
-TAO_Constraint_Evaluator::
-TAO_Constraint_Evaluator(CosTrading::Offer* offer,
-			 CORBA::ORB_ptr orb,
-			 CORBA::Boolean supports_dp)
-  : prop_eval_ (*offer, supports_dp),
-    orb_ (CORBA::ORB::_duplicate (orb))
-#else
 TAO_Constraint_Evaluator::
 TAO_Constraint_Evaluator(CosTrading::Offer* offer,
 			 CORBA::Boolean supports_dp)
   : prop_eval_ (*offer, supports_dp)
-#endif /* TAO_HAS_DYNAMIC_PROPERTY_BUG */
 {
   this->props_.clear();
   int length = offer->properties.length();
@@ -483,15 +474,8 @@ visit_property(TAO_Property_Constraint* literal)
       // Retrieve the value of the property from the Property_Evaluator
       int prop_index = (*prop_iter).second;
 
-#if defined TAO_HAS_DYNAMIC_PROPERTY_BUG
-      CORBA::Any* value =
-	this->prop_eval_.property_value (prop_index,
-					 this->orb_.ptr (),
-					 env);
-#else      
       CORBA::Any* value =
 	this->prop_eval_.property_value (prop_index, env);
-#endif /* TAO_HAS_DYNAMIC_PROPERTY_BUG */
 
       if (value != 0)
 	{
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Evaluator.h b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Evaluator.h
index 63f0a5f3646..ec790606172 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Evaluator.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Evaluator.h
@@ -47,15 +47,9 @@ class TAO_Constraint_Evaluator : public TAO_Constraint_Visitor
 {
 public:
 
-#if defined TAO_HAS_DYNAMIC_PROPERTY_BUG
   TAO_Constraint_Evaluator(CosTrading::Offer* offer,
-			   CORBA::ORB_ptr orb,
 			   CORBA::Boolean supports_dynamic_properties = 1);
-#else  
-  TAO_Constraint_Evaluator(CosTrading::Offer* offer,
-			   CORBA::Boolean supports_dynamic_properties = 1);
-#endif
-  
+
   CORBA::Boolean evaluate_constraint(TAO_Constraint* root);
   // Evaluate returns 1 if the offer satisfies the constraints
   // represented by the the expression tree rooted at <root>, 0 if it
@@ -157,10 +151,6 @@ private:
 
   Operand_Queue queue_;
   // The result of a non_boolean operation.
-
-#if defined TAO_HAS_DYNAMIC_PROPERTY_BUG
-  CORBA::ORB_var orb_;
-#endif /* TAO_HAS_DYNAMIC_PROPERTY_BUG */
 };
 
 template <class SEQ, class OPERAND_TYPE>
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.cpp b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.cpp
index a3fcd285a56..4077030341f 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.cpp
@@ -62,18 +62,6 @@ TAO_Constraint_Interpreter::~TAO_Constraint_Interpreter (void)
 {
 }
 
-#if defined TAO_HAS_DYNAMIC_PROPERTY_BUG
-
-CORBA::Boolean
-TAO_Constraint_Interpreter::
-evaluate (CosTrading::Offer* offer, CORBA::ORB_ptr orb)
-{
-  TAO_Constraint_Evaluator evaluator (offer, orb);
-  return evaluator.evaluate_constraint (this->root_);
-}
-
-#else
-
 CORBA::Boolean
 TAO_Constraint_Interpreter::evaluate (CosTrading::Offer* offer)
 {
@@ -81,8 +69,6 @@ TAO_Constraint_Interpreter::evaluate (CosTrading::Offer* offer)
   return evaluator.evaluate_constraint (this->root_);
 }
 
-#endif /* TAO_HAS_DYNAMIC_PROPERTY_BUG */
-
 CORBA::Boolean
 TAO_Constraint_Interpreter::evaluate(TAO_Constraint_Evaluator& evaluator)
 {
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h
index 9aa5483f614..4375676d342 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h
@@ -59,11 +59,7 @@ public:
   ~TAO_Constraint_Interpreter(void);
   // Destructor
 
-#if defined TAO_HAS_DYNAMIC_PROPERTY_BUG
-  CORBA::Boolean evaluate(CosTrading::Offer* offer, CORBA::ORB_ptr orb);
-#else
   CORBA::Boolean evaluate(CosTrading::Offer* offer);
-#endif /* TAO_HAS_DYNAMIC_PROPERTY_BUG */
 
   CORBA::Boolean evaluate(TAO_Constraint_Evaluator& evaluator);
   
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Dynamic_Property.cpp b/TAO/orbsvcs/orbsvcs/Trader/Dynamic_Property.cpp
index c704c4081f2..9d2d903f78c 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Dynamic_Property.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Dynamic_Property.cpp
@@ -34,20 +34,11 @@ register_handler(const char* name,
     this->handlers_[prop_name] = make_pair (handler, release_on_delete);
 }
 
-#if defined TAO_HAS_DYNAMIC_PROPERTY_BUG
-CosTradingDynamic::DynamicProp*
-TAO_DP_Dispatcher::
-construct_dynamic_prop (const char* name,
-			CORBA::TypeCode_ptr returned_type,
-			const CORBA::Any& extra_info,
-			CORBA::ORB_ptr orb)
-#else
 CosTradingDynamic::DynamicProp*
 TAO_DP_Dispatcher::
 construct_dynamic_prop (const char* name,
 			CORBA::TypeCode_ptr returned_type,
 			const CORBA::Any& extra_info)
-#endif /* TAO_HAS_DYNAMIC_PROPERTY_BUG */
 {
   CosTradingDynamic::DynamicProp* dp_struct = 0;
 
@@ -58,6 +49,7 @@ construct_dynamic_prop (const char* name,
       CosTradingDynamic::DynamicPropEval* dp_eval = this->_this (TAO_TRY_ENV);
 
 #if defined TAO_HAS_DYNAMIC_PROPERTY_BUG
+      CORBA::ORB_ptr orb = TAO_ORB_Core_instance ()-> orb ();
       dp_struct->eval_if = orb->object_to_string (dp_eval, TAO_TRY_ENV);
 #else
       dp_struct->eval_if = dp_eval;
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Dynamic_Property.h b/TAO/orbsvcs/orbsvcs/Trader/Dynamic_Property.h
index 66dfbc9ac43..f2e6a4dd8fc 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Dynamic_Property.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Dynamic_Property.h
@@ -69,19 +69,10 @@ public:
 		     CosTradingDynamic::DPEvalFailure));
   // Point of demultiplexing.  
 
-#if defined TAO_HAS_DYNAMIC_PROPERTY_BUG
-  CosTradingDynamic::DynamicProp*
-    construct_dynamic_prop (const char* name,			    
-			    CORBA::TypeCode_ptr returned_type,
-			    const CORBA::Any& extra_info,
-			    CORBA::ORB_ptr orb);
-#else
   CosTradingDynamic::DynamicProp*
     construct_dynamic_prop (const char* name,			    
 			    CORBA::TypeCode_ptr returned_type,
 			    const CORBA::Any& extra_info);
-#endif /* TAO_HAS_DYNAMIC_PROPERTY_BUG */
-  
 private:
 
   typedef map
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Lookup.cpp b/TAO/orbsvcs/orbsvcs/Trader/Lookup.cpp
index b939d3a9ce9..4fd0f5af13e 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Lookup.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Lookup.cpp
@@ -285,11 +285,7 @@ lookup_one_type (const char* type,
 	  // constraints. 
 	  CosTrading::Offer* offer = offer_iter->get_offer ();
 
-#ifdef TAO_HAS_DYNAMIC_PROPERTY_BUG
-	  TAO_Constraint_Evaluator evaluator (offer, this->trader_.orb ());
-#else
 	  TAO_Constraint_Evaluator evaluator (offer);
-#endif /* TAO_HAS_DYNAMIC_PROPERTY_BUG */
 	  if (offer_filter.ok_to_consider (offer) &&
 	      constr_inter.evaluate (evaluator))
 	    {
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Preference_Interpreter.cpp b/TAO/orbsvcs/orbsvcs/Trader/Preference_Interpreter.cpp
index 0ed0944139e..55fd85864a8 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Preference_Interpreter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Preference_Interpreter.cpp
@@ -63,20 +63,6 @@ TAO_Preference_Interpreter::~TAO_Preference_Interpreter()
 {
 }
 
-#if defined TAO_HAS_DYNAMIC_PROPERTY_BUG
-
-void 
-TAO_Preference_Interpreter::
-order_offer (CosTrading::OfferId offer_id,
-	     CosTrading::Offer* offer,
-	     CORBA::ORB_ptr orb)
-{
-  TAO_Constraint_Evaluator evaluator(offer, orb);
-  this->order_offer (offer_id, offer, evaluator);
-}
-
-#else
-
 void 
 TAO_Preference_Interpreter::
 order_offer (CosTrading::OfferId offer_id,
@@ -86,8 +72,6 @@ order_offer (CosTrading::OfferId offer_id,
   this->order_offer (offer_id, offer, evaluator);
 }
 
-#endif /* TAO_HAS_DYNAMIC_PROPERTY_BUG */
-
 void 
 TAO_Preference_Interpreter::
 order_offer (CosTrading::OfferId offer_id,
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Preference_Interpreter.h b/TAO/orbsvcs/orbsvcs/Trader/Preference_Interpreter.h
index ac9437e0bd1..11f384939d3 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Preference_Interpreter.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Preference_Interpreter.h
@@ -55,14 +55,8 @@ public:
   ~TAO_Preference_Interpreter(void);
   // Destructor
 
-#if defined TAO_HAS_DYNAMIC_PROPERTY_BUG
-  void order_offer (CosTrading::OfferId offer_id,
-		    CosTrading::Offer* offer,
-		    CORBA::ORB_ptr orb);
-#else
   void order_offer (CosTrading::OfferId offer_id,
 		    CosTrading::Offer* offer);
-#endif /* TAO_HAS_DYNAMIC_PROPERTY_BUG */
   
   void order_offer (CosTrading::OfferId offer_id,
 		    CosTrading::Offer* offer,
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Property_Evaluator.cpp b/TAO/orbsvcs/orbsvcs/Trader/Property_Evaluator.cpp
index e206b6dd78a..51dec4c60c2 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Property_Evaluator.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Property_Evaluator.cpp
@@ -44,19 +44,11 @@ TAO_Property_Evaluator::is_dynamic_property (int index)
   return return_value;
 }
 
-#if defined TAO_HAS_DYNAMIC_PROPERTY_BUG
-CORBA::Any*
-TAO_Property_Evaluator::property_value(int index,
-				       CORBA::ORB_ptr orb,
-				       CORBA::Environment& _env)
-  TAO_THROW_SPEC ((CORBA::SystemException,
-		   CosTradingDynamic::DPEvalFailure))
-#else
+
 CORBA::Any*
 TAO_Property_Evaluator::property_value(int index,
 				       CORBA::Environment& _env)
     TAO_THROW_SPEC ((CosTradingDynamic::DPEvalFailure))
-#endif /* TAO_HAS_DYNAMIC_PROPERTY_BUG */
 {
   CORBA::Any* prop_val = 0;
   
@@ -74,6 +66,7 @@ TAO_Property_Evaluator::property_value(int index,
       value >>= dp_struct;
 
 #if defined TAO_HAS_DYNAMIC_PROPERTY_BUG
+      CORBA::ORB_ptr orb = TAO_ORB_Core_instance ()->orb ();
       CORBA::Object_ptr obj = orb->string_to_object (dp_struct->eval_if, _env);
       TAO_CHECK_ENV_RETURN (_env, 0);
       dp_eval = CosTradingDynamic::DynamicPropEval::_narrow (obj, _env);
@@ -187,23 +180,10 @@ is_dynamic_property(const char* property_name)
   return predicate;
 }
 
-#if defined TAO_HAS_DYNAMIC_PROPERTY_BUG
-
-CORBA::Any*
-TAO_Property_Evaluator_By_Name::property_value (const char* property_name,
-						CORBA::ORB_ptr orb,
-						CORBA::Environment& _env)
-  TAO_THROW_SPEC ((CORBA::SystemException,
-		   CosTradingDynamic::DPEvalFailure))
-
-#else 
-
 CORBA::Any* 
 TAO_Property_Evaluator_By_Name::property_value (const char* property_name,
 						CORBA::Environment& _env)
   TAO_THROW_SPEC ((CosTradingDynamic::DPEvalFailure))
-  
-#endif /* TAO_HAS_DYNAMIC_PROPERTY_BUG */
 {
   CORBA::Any* prop_value = 0;
   string prop_name(property_name);
@@ -214,13 +194,7 @@ TAO_Property_Evaluator_By_Name::property_value (const char* property_name,
   if (lookup_iter != this->table_.end())
     {
       int index = (*lookup_iter).second;
-
-#if defined TAO_HAS_DYNAMIC_PROPERTY_BUG
-      prop_value =
-	this->TAO_Property_Evaluator::property_value (index, orb, _env);
-#else 
       prop_value = this->TAO_Property_Evaluator::property_value (index, _env);
-#endif /* TAO_HAS_DYNAMIC_PROPERTY_BUG */
     }
 
   return prop_value;
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Property_Evaluator.h b/TAO/orbsvcs/orbsvcs/Trader/Property_Evaluator.h
index 985a2df04e9..fd91dbf8d4c 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Property_Evaluator.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Property_Evaluator.h
@@ -52,15 +52,8 @@ public:
   // Returns 1 if the property at index <index> is dynamic. Returns a
   // 0 when the index is out of bounds.
 
-#if defined TAO_HAS_DYNAMIC_PROPERTY_BUG
-  CORBA::Any* property_value(int index,
-			     CORBA::ORB_ptr orb,
-			     CORBA::Environment& _env)
-    TAO_THROW_SPEC ((CosTradingDynamic::DPEvalFailure));
-#else
   CORBA::Any* property_value(int index, CORBA::Environment& _env)
     TAO_THROW_SPEC ((CosTradingDynamic::DPEvalFailure));
-#endif /*TAO_HAS_DYNAMIC_PROPERTY_BUG */
 
   // Returns value of the property whose index is <index>. If the
   // property at that index is dynamic and the trader supports dynamic 
@@ -121,17 +114,9 @@ public:
   // defined and dynamic. If the property is undefined, this method
   // will throw a Property_Undefined exception with impunity.
 
-#if defined TAO_HAS_DYNAMIC_PROPERTY_BUG
-  CORBA::Any* property_value(const char* property_name,
-			     CORBA::ORB_ptr orb,
-			     CORBA::Environment& _env)
-    TAO_THROW_SPEC ((CORBA::SystemException,
-		     CosTradingDynamic::DPEvalFailure));
-#else
   CORBA::Any* property_value(const char* property_name,
 			     CORBA::Environment& _env)
     TAO_THROW_SPEC ((CosTradingDynamic::DPEvalFailure));
-#endif /*TAO_HAS_DYNAMIC_PROPERTY_BUG */
 
   // This method is identical to its counterpart in
   // TAO_Property_Evaluator, except property_value first discovers the 
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Register.cpp b/TAO/orbsvcs/orbsvcs/Trader/Register.cpp
index 656de321442..a0b6425beec 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Register.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Register.cpp
@@ -254,13 +254,7 @@ TAO_Register<TRADER>::withdraw_using_constraint (const char *type,
 	  CosTrading::Offer* offer = offer_iter->get_offer ();
 	  // Add offer if it matches the constraints
 
-#if defined TAO_HAS_DYNAMIC_PROPERTY_BUG
-	  TAO_Constraint_Evaluator evaluator (offer,
-					      this->trader_.orb (),
-					      dp_support);
-#else
 	  TAO_Constraint_Evaluator evaluator (offer, dp_support);
-#endif /* TAO_HAS_DYNAMIC_PROPERTY_BUG */
 	  if (constr_inter.evaluate (evaluator))
 	    ids.push_back (offer_iter->get_id ());
 	  
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trader.cpp
index 538ad9c684e..2cc12c4ffa7 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader.cpp
@@ -20,16 +20,7 @@
 #include "ace/OS.h"
 #include <iostream.h>
 
-#if defined TAO_HAS_DYNAMIC_PROPERTY_BUG
-TAO_Trader_Base::TAO_Trader_Base (CORBA::ORB_ptr orb)
-  : trading_components_ (*this),
-    import_attributes_ (*this),
-    support_attributes_ (*this),
-    link_attributes_ (*this),
-    orb_ (CORBA::ORB::_duplicate (orb))
-{
-}
-#else
+
 TAO_Trader_Base::TAO_Trader_Base (void)
   : trading_components_ (*this),
     import_attributes_ (*this),
@@ -37,7 +28,6 @@ TAO_Trader_Base::TAO_Trader_Base (void)
     link_attributes_ (*this)
 {
 }
-#endif /* TAO_HAS_DYNAMIC_PROPERTY_BUG */
 
 TAO_Import_Attributes_Impl &
 TAO_Trader_Base::import_attributes (void)
@@ -113,14 +103,6 @@ TAO_Trader_Base::is_valid_identifier_name (const char* ident)
   return return_value;
 }
 
-#if defined TAO_HAS_DYNAMIC_PROPERTY_BUG
-CORBA::ORB_ptr
-TAO_Trader_Base::orb (void)
-{
-  return this->orb_.ptr ();  
-}
-#endif /* TAO_HAS_DYNAMIC_PROPERTY_BUG */
-
 int
 operator< (const SERVICE_TYPE_REPOS::IncarnationNumber &l,
 	   const SERVICE_TYPE_REPOS::IncarnationNumber &r)
@@ -143,24 +125,6 @@ operator> (const SERVICE_TYPE_REPOS::IncarnationNumber &l,
 
 #include "Trader_T.h"
 
-#if defined TAO_HAS_DYNAMIC_PROPERTY_BUG
-
-TAO_Trader_Factory::TAO_TRADER*
-TAO_Trader_Factory::create_linked_trader (CORBA::ORB_ptr orb)
-{
-  typedef TAO_Trader<ACE_Null_Mutex, ACE_Null_Mutex>  NULL_TRADER;
-  
-  NULL_TRADER::Trader_Components linked_trader =
-    (NULL_TRADER::Trader_Components)
-    (NULL_TRADER::LOOKUP |
-     NULL_TRADER::REGISTER |
-     NULL_TRADER::ADMIN |
-     NULL_TRADER::LINK);
-  return new NULL_TRADER (orb, linked_trader);
-}
-
-#else
-
 TAO_Trader_Factory::TAO_TRADER*
 TAO_Trader_Factory::create_linked_trader (void)
 {
@@ -175,8 +139,6 @@ TAO_Trader_Factory::create_linked_trader (void)
   return new NULL_TRADER (linked_trader);
 }
 
-#endif /* TAO_HAS_DYNAMIC_PROPERTY_BUG */
-
 #ifdef ACE_HAS_THREADS
 /*
 TAO_Trader_Factory::TAO_TRADER*
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader.h b/TAO/orbsvcs/orbsvcs/Trader/Trader.h
index 9778f6138bb..815943fd07c 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader.h
@@ -36,11 +36,7 @@ public:
 
   typedef TAO_Trader_Base TAO_TRADER;
 
-#if defined TAO_HAS_DYNAMIC_PROPERTY_BUG
-  static TAO_TRADER* create_linked_trader (CORBA::ORB_ptr orb);
-#else
   static TAO_TRADER* create_linked_trader (void);
-#endif /* TAO_HAS_DYNAMIC_PROPERTY_BUG */
   
 #ifdef ACE_HAS_THREADS
   
@@ -67,12 +63,8 @@ class TAO_Export TAO_Trader_Base
 public:
   typedef int HUGE_NUMBER;
 
-#if defined TAO_HAS_DYNAMIC_PROPERTY_BUG 
-  TAO_Trader_Base (CORBA::ORB_ptr orb);
-#else
   TAO_Trader_Base (void);
-#endif /* TAO_HAS_DYNAMIC_PROPERTY_BUG */
-  
+
   // = Accessors for objects that manage trader's configuration.
 
   TAO_Trading_Components_Impl &trading_components (void);
@@ -101,10 +93,6 @@ public:
   // first character is a letter, and the subsequent ones letter,
   // numbers, or underscores.)
 
-#if defined TAO_HAS_DYNAMIC_PROPERTY_BUG
-  CORBA::ORB_ptr orb (void);
-#endif /* TAO_HAS_DYNAMIC_PROPERTY_BUG */
-  
 protected:
   // = Objects determining current configuration of a trader.
 
@@ -119,11 +107,6 @@ protected:
 
   TAO_Link_Attributes_Impl link_attributes_;
   // Stores and allows access/modification of trader's link attributes.
-
-#if defined TAO_HAS_DYNAMIC_PROPERTY_BUG 
-  CORBA::ORB_var orb_;
-#endif /* TAO_HAS_DYNAMIC_PROPERTY_BUG */
-
 };
 
 int
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_T.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trader_T.cpp
index c69ff717ba4..a393acbb626 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_T.cpp
@@ -26,14 +26,8 @@
 #include "Admin.h"
 
 template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE> 
-#if defined TAO_HAS_DYNAMIC_PROPERTY_BUG
-TAO_Trader<TRADER_LOCK_TYPE, MAP_LOCK_TYPE>::
-TAO_Trader (CORBA::ORB_ptr orb, Trader_Components components)
-  : TAO_Trader_Base (orb)
-#else
 TAO_Trader<TRADER_LOCK_TYPE, MAP_LOCK_TYPE>::
 TAO_Trader (Trader_Components components)
-#endif /* TAO_HAS_DYNAMIC_PROPERTY_BUG */
 {
   CORBA::Environment env;
   for (int i = LOOKUP_IF; i <= LINK_IF; i++)
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_T.h b/TAO/orbsvcs/orbsvcs/Trader/Trader_T.h
index dc27e10b27f..cd33e5344e4 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader_T.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_T.h
@@ -61,12 +61,7 @@ public:
   typedef SERVICE_TYPE_MAP::Local_Offer_Iterator LOCAL_OFFER_ITER;
   typedef MAP_LOCK_TYPE LOCK_TYPE;
 
-#if defined TAO_HAS_DYNAMIC_PROPERTY_BUG
-  TAO_Trader (CORBA::ORB_ptr orb, Trader_Components components = LOOKUP);
-#else
   TAO_Trader (Trader_Components components = LOOKUP);
-#endif /* TAO_HAS_DYNAMIC_PROPERTY_BUG */
-  
   // Constructor which based on its arguments will create 
   // a particular type of trader (e.g. Query trader, Simple trader, etc.)
   // The argument is a bitwise OR of desired Trader_Components as listed
diff --git a/TAO/orbsvcs/tests/Trading_Service/Makefile b/TAO/orbsvcs/tests/Trading_Service/Makefile
index b60297c333f..7b64a6736f1 100644
--- a/TAO/orbsvcs/tests/Trading_Service/Makefile
+++ b/TAO/orbsvcs/tests/Trading_Service/Makefile
@@ -69,8 +69,6 @@ LSRC    = $(addsuffix .cpp,$(FILES))
 LDLIBS  = -lTTest -lorbsvcs -lospace -lTAO
 VLDLIBS = $(LDLIBS:%=%$(VAR))
 
-CPPFLAGS += -DTAO_HAS_DYNAMIC_PROPERTY_BUG
-
 #----------------------------------------------------------------------------
 #	Include macros and targets
 #----------------------------------------------------------------------------
diff --git a/TAO/orbsvcs/tests/Trading_Service/Offer_Exporter.cpp b/TAO/orbsvcs/tests/Trading_Service/Offer_Exporter.cpp
index 8e2fe4fe451..eee60234d0a 100644
--- a/TAO/orbsvcs/tests/Trading_Service/Offer_Exporter.cpp
+++ b/TAO/orbsvcs/tests/Trading_Service/Offer_Exporter.cpp
@@ -44,11 +44,9 @@ Simple_DP_Evaluation_Handler<T>::evalDP (const CORBA::Any& extra_info,
 TAO_Offer_Exporter::
 TAO_Offer_Exporter (PortableServer::POA_ptr poa_object,
 		    CosTrading::Register_ptr register_if,
-		    CORBA::ORB_ptr orb,
 		    CORBA::Environment& _env)
   TAO_THROW_SPEC ((CORBA::SystemException))
-    : orb_ (CORBA::ORB::_duplicate (orb)),
-      register_ (register_if)
+    : register_ (register_if)
 {
   this->create_offers ();
   this->admin_ = register_if->admin_if (_env);
@@ -158,11 +156,7 @@ TAO_Offer_Exporter::describe_offers (CORBA::Environment& _env)
 
 	      ACE_DEBUG ((LM_DEBUG, "Offer Id: %s\n", (const char *) offer_id_seq[i]));
 	      ACE_DEBUG ((LM_DEBUG, "Service Type: %s\n", offer_info->type.in ()));	      
-#if defined TAO_HAS_DYNAMIC_PROPERTY_BUG
-	      TT_Info::dump_properties (offer_info->properties, this->orb_.ptr ());
-#else  
 	      TT_Info::dump_properties (offer_info->properties);
-#endif /* TAO_HAS_DYNAMIC_PROPERTY_BUG */ 
 	      ACE_DEBUG ((LM_DEBUG, "------------------------------\n"));
 	    }
 	}
@@ -293,22 +287,6 @@ TAO_Offer_Exporter::create_offers (void)
 	  ulong_seq[j] = counter * 10000;
 	}
 
-#if defined TAO_HAS_DYNAMIC_PROPERTY_BUG
-      
-      dp_user_queue = this->dp_plotters_[i].construct_dynamic_prop
-	(TT_Info::PLOTTER_PROPERTY_NAMES[TT_Info::PLOTTER_USER_QUEUE],
-	 TT_Info::PLOTTER_PROPERTY_TYPES[TT_Info::PLOTTER_USER_QUEUE],
-	 extra_info,
-	 this->orb_.ptr ());
-
-      dp_file_queue = this->dp_plotters_[i].construct_dynamic_prop
-	(TT_Info::PLOTTER_PROPERTY_NAMES[TT_Info::PLOTTER_FILE_SIZES_PENDING],
-	 TT_Info::PLOTTER_PROPERTY_TYPES[TT_Info::PLOTTER_FILE_SIZES_PENDING],
-	 extra_info,
-	 this->orb_.ptr ());
-
-#else
-
       dp_user_queue = this->dp_plotters_[i].construct_dynamic_prop
 	(TT_Info::PLOTTER_PROPERTY_NAMES[TT_Info::PLOTTER_USER_QUEUE],
 	 TT_Info::PLOTTER_PROPERTY_TYPES[TT_Info::PLOTTER_USER_QUEUE],
@@ -319,14 +297,11 @@ TAO_Offer_Exporter::create_offers (void)
 	 TT_Info::PLOTTER_PROPERTY_TYPES[TT_Info::PLOTTER_FILE_SIZES_PENDING],
 	 extra_info);
       
-#endif /* TAO_HAS_DYNAMIC_PROPERTY_BUG */ 
-      
       this->dp_plotters_[i].register_handler
 	(TT_Info::PLOTTER_PROPERTY_NAMES[TT_Info::PLOTTER_USER_QUEUE],
 	 new Simple_DP_Evaluation_Handler<TAO_Sequences::StringSeq> (string_seq),
 	 CORBA::B_TRUE);
 
-
       this->dp_plotters_[i].register_handler
 	(TT_Info::PLOTTER_PROPERTY_NAMES[TT_Info::PLOTTER_FILE_SIZES_PENDING],
 	 new Simple_DP_Evaluation_Handler<TAO_Sequences::ULongSeq> (ulong_seq),
diff --git a/TAO/orbsvcs/tests/Trading_Service/Offer_Exporter.h b/TAO/orbsvcs/tests/Trading_Service/Offer_Exporter.h
index f207557e1c7..c827677e18a 100644
--- a/TAO/orbsvcs/tests/Trading_Service/Offer_Exporter.h
+++ b/TAO/orbsvcs/tests/Trading_Service/Offer_Exporter.h
@@ -25,7 +25,6 @@ public:
 
   TAO_Offer_Exporter (PortableServer::POA_ptr poa,
 		      CosTrading::Register_ptr register_if,
-		      CORBA::ORB_ptr orb,
 		      CORBA::Environment& env)
     TAO_THROW_SPEC ((CORBA::SystemException));
 
@@ -84,8 +83,6 @@ private:
 
   void create_offers (void);
 
-  CORBA::ORB_var orb_;
-  
   CosTrading::Register_var register_;
   CosTrading::Admin_var admin_;
   
diff --git a/TAO/orbsvcs/tests/Trading_Service/Offer_Importer.cpp b/TAO/orbsvcs/tests/Trading_Service/Offer_Importer.cpp
index 20e13d75a76..50fee229a45 100644
--- a/TAO/orbsvcs/tests/Trading_Service/Offer_Importer.cpp
+++ b/TAO/orbsvcs/tests/Trading_Service/Offer_Importer.cpp
@@ -2,10 +2,8 @@
 #include "Offer_Importer.h"
 #include "orbsvcs/Trader/Policy_Manager.h"
 
-TAO_Offer_Importer::TAO_Offer_Importer (CosTrading::Lookup_ptr lookup_if,
-					CORBA::ORB_ptr orb)
-  : orb_ (CORBA::ORB::_duplicate (orb)),
-    lookup_ (lookup_if)
+TAO_Offer_Importer::TAO_Offer_Importer (CosTrading::Lookup_ptr lookup_if)
+  : lookup_ (lookup_if)
 {
 }
 
@@ -104,11 +102,7 @@ TAO_Offer_Importer::display_results (const CosTrading::OfferSeq& offer_seq,
 {
   for (int length = offer_seq.length (), i = 0; i < length; i++)
     {
-#if defined TAO_HAS_DYNAMIC_PROPERTY_BUG
-      TT_Info::dump_properties (offer_seq[i].properties, this->orb_.ptr ());
-#else
       TT_Info::dump_properties (offer_seq[i].properties);
-#endif /* TAO_HAS_DYNAMIC_PROPERTY_BUG */
       ACE_DEBUG ((LM_DEBUG, "------------------------------\n"));
     }
 
@@ -131,11 +125,7 @@ TAO_Offer_Importer::display_results (const CosTrading::OfferSeq& offer_seq,
 	      for (length = iter_offers->length (), i = 0; i < length; i++)
 		{
 		  CosTrading::PropertySeq& props = iter_offers[i].properties;
-#if defined TAO_HAS_DYNAMIC_PROPERTY_BUG
-		  TT_Info::dump_properties (props, this->orb_.ptr ());
-#else 
 		  TT_Info::dump_properties (props);
-#endif /* TAO_HAS_DYNAMIC_PROPERTY_BUG */
 		  ACE_DEBUG ((LM_DEBUG, "------------------------------\n"));
 		}
 	      
diff --git a/TAO/orbsvcs/tests/Trading_Service/Offer_Importer.h b/TAO/orbsvcs/tests/Trading_Service/Offer_Importer.h
index 9ef8dcb47e6..0fe948e783c 100644
--- a/TAO/orbsvcs/tests/Trading_Service/Offer_Importer.h
+++ b/TAO/orbsvcs/tests/Trading_Service/Offer_Importer.h
@@ -22,8 +22,7 @@ class TAO_Offer_Importer
 {
 public:
 
-  TAO_Offer_Importer (CosTrading::Lookup_ptr lookup_if,
-		      CORBA::ORB_ptr orb);
+  TAO_Offer_Importer (CosTrading::Lookup_ptr lookup_if);
 
   void perform_queries (CORBA::Environment& _env)
     TAO_THROW_SPEC ((CORBA::SystemException,
@@ -57,8 +56,6 @@ private:
 			CORBA::Environment& _env) const
     TAO_THROW_SPEC ((CORBA::SystemException));
 
-  CORBA::ORB_var orb_;
-  
   CosTrading::Lookup_var lookup_;
   
 };
diff --git a/TAO/orbsvcs/tests/Trading_Service/TT_Info.cpp b/TAO/orbsvcs/tests/Trading_Service/TT_Info.cpp
index 4d050e587c2..707f32c50de 100644
--- a/TAO/orbsvcs/tests/Trading_Service/TT_Info.cpp
+++ b/TAO/orbsvcs/tests/Trading_Service/TT_Info.cpp
@@ -211,15 +211,8 @@ const char* TT_Info::QUERIES[][3] =
   {INTERFACE_NAMES[REMOTE_IO], "", ""}
 };
 
-
-#if defined TAO_HAS_DYNAMIC_PROPERTY_BUG
-void
-TT_Info::dump_properties (const CosTrading::PropertySeq& prop_seq,
-			  CORBA::ORB_ptr orb)
-#else
 void
 TT_Info::dump_properties (const CosTrading::PropertySeq& prop_seq)
-#endif /* TAO_HAS_DYNAMIC_PROPERTY_BUG */
 {
   CORBA::Environment env;
   TAO_Property_Evaluator prop_eval (prop_seq);
@@ -231,11 +224,7 @@ TT_Info::dump_properties (const CosTrading::PropertySeq& prop_seq)
       ACE_DEBUG ((LM_DEBUG, "%-15s: ", prop_seq[k].name.in ()));
       TAO_TRY
 	{
-#if defined TAO_HAS_DYNAMIC_PROPERTY_BUG
-	  value = prop_eval.property_value(k, orb, env);
-#else
 	  value = prop_eval.property_value(k, env);
-#endif /* TAO_HAS_DYNAMIC_PROPERTY_BUG */
 	  TAO_CHECK_ENV;
 
 	  tc = value->type ();
diff --git a/TAO/orbsvcs/tests/Trading_Service/TT_Info.h b/TAO/orbsvcs/tests/Trading_Service/TT_Info.h
index cc46d7992e6..f4544bf80ed 100644
--- a/TAO/orbsvcs/tests/Trading_Service/TT_Info.h
+++ b/TAO/orbsvcs/tests/Trading_Service/TT_Info.h
@@ -11,12 +11,7 @@ class TT_Info
 {
 public:
 
-#if defined TAO_HAS_DYNAMIC_PROPERTY_BUG
-  static void dump_properties (const CosTrading::PropertySeq& prop_seq,
-			       CORBA::ORB_ptr orb);
-#else  
   static void dump_properties (const CosTrading::PropertySeq& prop_seq);
-#endif /* TAO_HAS_DYNAMIC_PROPERTY_BUG */
   // Dump the contents of this property sequence.
 
   enum INTERFACES
diff --git a/TAO/orbsvcs/tests/Trading_Service/colocated_test.cpp b/TAO/orbsvcs/tests/Trading_Service/colocated_test.cpp
index 05bf5571238..6d836a8e272 100644
--- a/TAO/orbsvcs/tests/Trading_Service/colocated_test.cpp
+++ b/TAO/orbsvcs/tests/Trading_Service/colocated_test.cpp
@@ -35,15 +35,8 @@ main (int argc, char** argv)
       
       // Create a Service Type Repository and a Trader Object.
       TAO_Service_Type_Repository type_repos;
-
-#if defined TAO_HAS_DYNAMIC_PROPERTY_BUG
-      auto_ptr<TAO_Trader_Factory::TAO_TRADER> trader =
-	TAO_Trader_Factory::create_linked_trader (orb.ptr ());      
-#else
       auto_ptr<TAO_Trader_Factory::TAO_TRADER> trader =
 	TAO_Trader_Factory::create_linked_trader ();
-#endif /* TAO_HAS_DYNAMIC_PROPERTY_BUG */
-
       TAO_Support_Attributes_Impl& sup_attr = trader->support_attributes ();
       TAO_Trading_Components_Impl& trd_comp = trader->trading_components ();
 
@@ -84,19 +77,12 @@ main (int argc, char** argv)
 
       // Run the Offer Exporter tests
       ACE_DEBUG ((LM_DEBUG, "Running the Offer Exporter tests.\n"));
-#if defined TAO_HAS_DYNAMIC_PROPERTY_BUG
-      TAO_Offer_Exporter offer_exporter
-	(root_poa.ptr (),
-	 CosTrading::Register::_duplicate (trd_comp.register_if ()),
-	 orb.ptr (),
-	 TAO_TRY_ENV);
-#else
       TAO_Offer_Exporter offer_exporter
 	(root_poa.ptr (),
 	 CosTrading::Register::_duplicate (trd_comp.register_if ()),
 	 TAO_TRY_ENV);
       TAO_CHECK_ENV;
-#endif /* TAO_HAS_DYNAMIC_PROPERTY_BUG */
+
       offer_exporter.withdraw_offers (TAO_TRY_ENV);
       TAO_CHECK_ENV;
 
@@ -132,14 +118,8 @@ main (int argc, char** argv)
 
       // Run the Offer Importer tests
       ACE_DEBUG ((LM_DEBUG, "Running the Offer Exporter tests.\n"));
-#if defined TAO_HAS_DYNAMIC_PROPERTY_BUG
-      TAO_Offer_Importer offer_importer
-	(CosTrading::Lookup::_duplicate (trd_comp.lookup_if ()),
-	 orb.ptr ());
-#else
       TAO_Offer_Importer offer_importer
 	(CosTrading::Lookup::_duplicate (trd_comp.lookup_if ()));
-#endif /* TAO_HAS_DYNAMIC_PROPERTY_BUG */
       TAO_CHECK_ENV;
       
       offer_importer.perform_queries (TAO_TRY_ENV);
diff --git a/TAO/orbsvcs/tests/Trading_Service/export_test.cpp b/TAO/orbsvcs/tests/Trading_Service/export_test.cpp
index 7800041d5f6..0ca7763fc67 100644
--- a/TAO/orbsvcs/tests/Trading_Service/export_test.cpp
+++ b/TAO/orbsvcs/tests/Trading_Service/export_test.cpp
@@ -89,7 +89,6 @@ main (int argc, char** argv)
       ACE_DEBUG ((LM_DEBUG, "Running the Offer Exporter tests.\n"));
       TAO_Offer_Exporter offer_exporter (root_poa.ptr (),
 					 register_if,
-					 orb.ptr (),
 					 TAO_TRY_ENV);
       TAO_CHECK_ENV;
 	    
diff --git a/TAO/orbsvcs/tests/Trading_Service/import_test.cpp b/TAO/orbsvcs/tests/Trading_Service/import_test.cpp
index 236beddbf2f..50b948cc20a 100644
--- a/TAO/orbsvcs/tests/Trading_Service/import_test.cpp
+++ b/TAO/orbsvcs/tests/Trading_Service/import_test.cpp
@@ -33,12 +33,7 @@ main (int argc, char** argv)
       
       // Run the Offer Importer tests
       ACE_DEBUG ((LM_DEBUG, "Running the Offer Importer tests.\n"));
-
-#if defined TAO_HAS_DYNAMIC_PROPERTY_BUG
-      TAO_Offer_Importer offer_importer (lookup_if.in (), orb.ptr ());
-#else
       TAO_Offer_Importer offer_importer (lookup_if.in ());
-#endif
       
       offer_importer.perform_queries (TAO_TRY_ENV);
       TAO_CHECK_ENV;