1 files changed, 7 insertions, 7 deletions
diff --git a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_i.cpp b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_i.cpp
index eb25db6608c..78b973c67fb 100644
--- a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_i.cpp
+++ b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_i.cpp
@@ -30,21 +30,18 @@ namespace TAO
 
   char *
   ObjectReferenceTemplate::server_id (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     return CORBA::string_dup (this->server_id_);
   }
 
   char *
   ObjectReferenceTemplate::orb_id (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     return CORBA::string_dup (this->orb_id_);
   }
 
   PortableInterceptor::AdapterName *
   ObjectReferenceTemplate::adapter_name (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     PortableInterceptor::AdapterName *adapter_name = 0;
 
@@ -65,12 +62,15 @@ namespace TAO
       const char *,
       const PortableInterceptor::ObjectId &
       )
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
-    if (CORBA::is_nil(poa_.in()))
-      ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (), CORBA::Object::_nil ());
+    if (CORBA::is_nil (this->poa_.in ()))
+      throw ::CORBA::BAD_INV_ORDER ();
 
-    TAO_Root_POA* tao_poa = dynamic_cast<TAO_Root_POA*>(poa_.in());
+    TAO_Root_POA* const tao_poa =
+      dynamic_cast<TAO_Root_POA*> (this->poa_.in());
+
+    if (!tao_poa)
+      throw ::CORBA::INTERNAL ();
 
     return tao_poa->invoke_key_to_object ();
   }