Some vestigial TAO_HAS_OBJECT_IN_STRUCT_MARSHAL_BUG code was

being compiled and screwing up the exporter_test for federated
exports. That code has been vanquished.

3 files changed, 4 insertions, 39 deletions

diff --git a/TAO/orbsvcs/tests/Trading/Offer_Exporter.cpp b/TAO/orbsvcs/tests/Trading/Offer_Exporter.cpp
index b3fb7b84373..ded5b8905ef 100644
--- a/TAO/orbsvcs/tests/Trading/Offer_Exporter.cpp
+++ b/TAO/orbsvcs/tests/Trading/Offer_Exporter.cpp
@@ -172,20 +172,8 @@ TAO_Offer_Exporter::export_offers_to_all (CORBA::Environment& TAO_IN_ENV)
                           ACE_static_cast (const char*, link_name_seq[i])));
             }
 
-          CosTrading::Register_var remote_reg;
-#ifdef TAO_HAS_OBJECT_IN_STRUCT_MARSHAL_BUG
-          CORBA::ORB_ptr orb = TAO_ORB_Core_instance ()-> orb ();
-          CORBA::Object_var obj = orb->string_to_object (link_info->target_reg, TAO_TRY_ENV);
+          this->export_to (link_info->target_reg.in (), TAO_TRY_ENV);
           TAO_CHECK_ENV;
-          remote_reg = CosTrading::Register::_narrow (obj.in (), TAO_TRY_ENV);
-          TAO_CHECK_ENV;
-#else
-          TAO_CHECK_ENV;
-          remote_reg = link_info->target_reg.in ();
-#endif /* TAO_HAS_OBJECT_IN_STRUCT_MARSHAL_BUG */
-
-          this->export_to (remote_reg.in (), TAO_IN_ENV);
-          TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
         }
       TAO_CATCHANY
         {
diff --git a/TAO/orbsvcs/tests/Trading/Offer_Importer.cpp b/TAO/orbsvcs/tests/Trading/Offer_Importer.cpp
index dec7312c051..98748f9bbec 100644
--- a/TAO/orbsvcs/tests/Trading/Offer_Importer.cpp
+++ b/TAO/orbsvcs/tests/Trading/Offer_Importer.cpp
@@ -86,17 +86,7 @@ TAO_Offer_Importer::perform_directed_queries (CORBA::Environment& TAO_IN_ENV)
         link_if->describe_link (link_name_seq[0], TAO_IN_ENV);
       TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
 
-      CosTrading::Lookup_var lookup_if;
-#ifdef TAO_HAS_OBJECT_IN_STRUCT_MARSHAL_BUG
-      CORBA::ORB_ptr orb = TAO_ORB_Core_instance ()-> orb ();
-      CORBA::Object_var obj = orb->string_to_object (link_info->target, TAO_IN_ENV);
-      TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
-      lookup_if = CosTrading::Lookup::_narrow (obj.in (), TAO_IN_ENV);
-      TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
-#else
-      lookup_if = CosTrading::Lookup::_duplicate (link_info->target.in ());
-#endif /* TAO_HAS_OBJECT_IN_STRUCT_MARSHAL_BUG */
-
+      CosTrading::Lookup_ptr lookup_if = link_info->target.in ();
       CosTrading::Link_var link_if2 = lookup_if->link_if (TAO_IN_ENV);
       TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
 
diff --git a/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp b/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp
index 9115c412078..0074451d717 100644
--- a/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp
+++ b/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp
@@ -117,23 +117,10 @@ TAO_Service_Type_Exporter::add_all_types_to_all (CORBA::Environment& TAO_IN_ENV)
           ACE_DEBUG ((LM_DEBUG, "Adding service types to %s\n",
                       ACE_static_cast (const char*, link_name_seq[i])));
 
-          CosTrading::TypeRepository_var remote_repos;
-#ifdef TAO_HAS_OBJECT_IN_STRUCT_MARSHAL_BUG
-          CORBA::ORB_ptr orb = TAO_ORB_Core_instance ()-> orb ();
-          CORBA::Object_var obj = orb->string_to_object (link_info->target, TAO_TRY_ENV);
+          CosTrading::TypeRepository_var remote_repos = 
+            link_info->target->type_repos (TAO_TRY_ENV);
           TAO_CHECK_ENV;
 
-          CosTrading::Lookup_ptr remote_lookup =
-            CosTrading::Lookup::_narrow (obj.in (), TAO_TRY_ENV);
-          TAO_CHECK_ENV;
-
-          remote_repos = remote_lookup->type_repos (TAO_TRY_ENV);
-          TAO_CHECK_ENV;
-#else
-          remote_repos = link_info->target->type_repos (TAO_TRY_ENV);
-          TAO_CHECK_ENV;
-#endif /* TAO_HAS_OBJECT_IN_STRUCT_MARSHAL_BUG */
-
           CosTradingRepos::ServiceTypeRepository_ptr str =
             CosTradingRepos::ServiceTypeRepository::_narrow (remote_repos.in (), TAO_TRY_ENV);
           TAO_CHECK_ENV;