1 files changed, 2 insertions, 16 deletions
diff --git a/TAO/tao/Strategies/UIOP_Profile.cpp b/TAO/tao/Strategies/UIOP_Profile.cpp
index 6a2991fe989..d5fe4796953 100644
--- a/TAO/tao/Strategies/UIOP_Profile.cpp
+++ b/TAO/tao/Strategies/UIOP_Profile.cpp
@@ -358,25 +358,11 @@ TAO_UIOP_Profile::decode (TAO_InputCDR& cdr)
                   encap_len));
     }
 
-
-  // @@ RTCORBA_SUBSETTING:
-  // The original version pre-subsetting was as below. We moved this
-  // code out because it is not in the critical path, does not interfere
-  // with the correctness of the method.
-
+  // Decode any additional endpoints per profile.  (At the present,
+  // only RTCORBA takes advantage of this feature.)
   if (this->decode_endpoints () == -1)
     return -1;
 
-//#if (TAO_HAS_RT_CORBA == 1)
-
-  // Currently there are > 1 endpoint per profile only with RTCORBA.
-
-  // Decode endpoints, if any.
-//   if (this->decode_endpoints () == -1)
-//     return -1;
-
-// #endif  /* TAO_HAS_RT_CORBA == 1 */
-
   if (cdr.good_bit ())
     return 1;