1 files changed, 26 insertions, 35 deletions

diff --git a/CIAO/ciao/Context_Impl_T.cpp b/CIAO/ciao/Context_Impl_T.cpp
index 94bc0ac65eb..29558dafb0b 100644
--- a/CIAO/ciao/Context_Impl_T.cpp
+++ b/CIAO/ciao/Context_Impl_T.cpp
@@ -9,22 +9,20 @@ namespace CIAO
 {
   template <typename BASE_CTX,
             typename SVNT,
-            typename COMP,
-            typename COMP_VAR>
-  Context_Impl<BASE_CTX, SVNT, COMP, COMP_VAR>::Context_Impl (
-      Components::CCMHome_ptr home,
+            typename COMP>
+  Context_Impl<BASE_CTX, SVNT, COMP>::Context_Impl (
+      Components::CCMHome_ptr the_home,
       Session_Container *c,
       SVNT *sv)
-    : Context_Impl_Base (home, c),
+    : Context_Impl_Base (the_home, c),
       servant_ (sv)
   {
   }
 
   template <typename BASE_CTX,
             typename SVNT,
-            typename COMP,
-            typename COMP_VAR>
-  Context_Impl<BASE_CTX, SVNT, COMP, COMP_VAR>::~Context_Impl (void)
+            typename COMP>
+  Context_Impl<BASE_CTX, SVNT, COMP>::~Context_Impl (void)
   {
   }
 
@@ -32,38 +30,31 @@ namespace CIAO
 
   template <typename BASE_CTX,
             typename SVNT,
-            typename COMP,
-            typename COMP_VAR>
+            typename COMP>
   CORBA::Object_ptr
-  Context_Impl<BASE_CTX, SVNT, COMP, COMP_VAR>::get_CCM_object (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Components::IllegalState))
+  Context_Impl<BASE_CTX, SVNT, COMP>::get_CCM_object (void)
   {
     if (CORBA::is_nil (this->component_.in ()))
-    {
-      CORBA::Object_var obj;
-
-      try
-        {
-          obj =
-            this->container_->get_objref (this->servant_);
-        }
-      catch (const CORBA::Exception& ex)
-        {
-          ex._tao_print_exception ("Caught Exception \n");
-          return CORBA::Object::_nil ();
-        }
-
-
-      this->component_ = COMP::_narrow (obj.in ());
-
-      if (CORBA::is_nil (this->component_.in ()))
       {
-        ACE_THROW_RETURN (CORBA::INTERNAL (),
-                          CORBA::Object::_nil ());
+        CORBA::Object_var obj;
+
+        try
+          {
+            obj = this->container_->get_objref (this->servant_);
+          }
+        catch (const CORBA::Exception& ex)
+          {
+            ex._tao_print_exception ("Caught Exception \n");
+            return CORBA::Object::_nil ();
+          }
+
+        this->component_ = COMP::_narrow (obj.in ());
+
+        if (CORBA::is_nil (this->component_.in ()))
+          {
+            throw CORBA::INTERNAL ();
+          }
       }
-    }
 
     return COMP::_duplicate (this->component_.in ());
   }