1 files changed, 7 insertions, 3 deletions
diff --git a/TAO/tao/Strategies/Optimized_Connection_Endpoint_Selector.cpp b/TAO/tao/Strategies/Optimized_Connection_Endpoint_Selector.cpp
index a60ed33ad4b..de79c013571 100644
--- a/TAO/tao/Strategies/Optimized_Connection_Endpoint_Selector.cpp
+++ b/TAO/tao/Strategies/Optimized_Connection_Endpoint_Selector.cpp
@@ -165,9 +165,13 @@ TAO_Optimized_Connection_Endpoint_Selector::select_endpoint
     }
   while (r->stub ()->next_profile_retry () != 0);
 
-  // If we get here, we completely failed to find an endpoint selector
-  // that we know how to use, so throw an exception.
-  throw ::CORBA::TRANSIENT (CORBA::OMGVMCID | 2, CORBA::COMPLETED_NO);
+  // If we get here, we completely failed to find an endpoint
+  // that we know how to use. We used to throw an exception
+  // but that would prevent any request interception points
+  // being called. They may know how to fix the problem so
+  // we wait to throw the exception in
+  // Synch_Twoway_Invocation::remote_twoway and
+  // Synch_Oneway_Invocation::remote_oneway instead.
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL