Thu Apr 14 02:02:13 CDT 2005 Will Otte <wotte@dre.vanderbilt.edu>

10 files changed, 62 insertions, 29 deletions

diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog
index ea925b56472..b751bfbcadf 100644
--- a/TAO/CIAO/ChangeLog
+++ b/TAO/CIAO/ChangeLog
@@ -1,3 +1,17 @@
+Thu Apr 14 02:02:13 CDT 2005  Will Otte  <wotte@dre.vanderbilt.edu>
+	
+	* DAnCE/ExecutionManager/Execution_Manager.cpp
+	* DAnCE/ciao/Context_Impl_T.cpp
+	* DAnCE/ciao/Dynamic_Component_Servant_Base.h
+	* DAnCE/ciao/Dynamic_Component_Servant_T.cpp
+	* DAnCE/ciao/Dynamic_Component_Servant_T.h
+	* DAnCE/ciao/Home_Servant_Impl_T.cpp
+	* DAnCE/ciao/Servant_Impl_T.cpp
+	* DAnCE/ciao/Swapping_Servant_Home_Impl_T.cpp
+	* DAnCE/ciao/Upgradeable_Context_Impl_T.cpp
+
+	Fixed a number of mistakes with emulated exceptions. 
+	
 Wed Apr 13 18:55:58 2005  Gan Deng  <dengg@dre.vanderbilt.edu>
 
 	* DAnCE/ciao/CCM_Component.idl
diff --git a/TAO/CIAO/DAnCE/ExecutionManager/Execution_Manager.cpp b/TAO/CIAO/DAnCE/ExecutionManager/Execution_Manager.cpp
index 94d155fd73d..608a0399a8e 100644
--- a/TAO/CIAO/DAnCE/ExecutionManager/Execution_Manager.cpp
+++ b/TAO/CIAO/DAnCE/ExecutionManager/Execution_Manager.cpp
@@ -159,8 +159,8 @@ namespace CIAO
           CIAO::ExecutionManagerDaemon_var daemon =
             daemon_servant->_this ();
 
-          TAO::Utils::Implicit_Deactivator de (daemon_servant
-                                               ACE_ENV_ARG_PARAMETER);
+          TAO::Utils::Implicit_Deactivator de (daemon_servant);
+                                               
           ACE_TRY_CHECK;
 
           bool retval = false;
diff --git a/TAO/CIAO/DAnCE/ciao/Context_Impl_T.cpp b/TAO/CIAO/DAnCE/ciao/Context_Impl_T.cpp
index 232c102400b..9dca7821824 100644
--- a/TAO/CIAO/DAnCE/ciao/Context_Impl_T.cpp
+++ b/TAO/CIAO/DAnCE/ciao/Context_Impl_T.cpp
@@ -44,17 +44,23 @@ namespace CIAO
     if (CORBA::is_nil (this->component_.in ()))
     {
       CORBA::Object_var obj;
-      ACE_TRY {
-      obj =
-        this->container_->get_objref (this->servant_
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (CORBA::Object::_nil ());
-       }
-      ACE_CATCHANY { ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                                          "Caught Exception \n"); return 0;}
-      ACE_ENDTRY;
-
 
+      ACE_TRY 
+        {
+          obj =
+            this->container_->get_objref (this->servant_
+                                          ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK; 
+        }
+      ACE_CATCHANY 
+        { 
+          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+                               "Caught Exception \n"); 
+          return CORBA::Object::_nil ();
+        }
+      ACE_ENDTRY;
+      
+      
       this->component_ = COMP::_narrow (obj.in ()
                                         ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA::Object::_nil ());
diff --git a/TAO/CIAO/DAnCE/ciao/Dynamic_Component_Servant_Base.h b/TAO/CIAO/DAnCE/ciao/Dynamic_Component_Servant_Base.h
index aaf04ee755b..db1a89fd6f6 100644
--- a/TAO/CIAO/DAnCE/ciao/Dynamic_Component_Servant_Base.h
+++ b/TAO/CIAO/DAnCE/ciao/Dynamic_Component_Servant_Base.h
@@ -38,7 +38,8 @@ namespace CIAO
     virtual ~Dynamic_Component_Servant_Base (void);
 
     virtual PortableServer::Servant
-      create (PortableServer::ObjectId &oid) = 0;
+      create (PortableServer::ObjectId &oid
+              ACE_ENV_ARG_DECL_WITH_DEFAULTS) = 0;
 
     virtual void destroy (PortableServer::ObjectId &oid) = 0;
 
diff --git a/TAO/CIAO/DAnCE/ciao/Dynamic_Component_Servant_T.cpp b/TAO/CIAO/DAnCE/ciao/Dynamic_Component_Servant_T.cpp
index 13ae100380f..907cda7ad2e 100644
--- a/TAO/CIAO/DAnCE/ciao/Dynamic_Component_Servant_T.cpp
+++ b/TAO/CIAO/DAnCE/ciao/Dynamic_Component_Servant_T.cpp
@@ -81,21 +81,22 @@ namespace CIAO
             typename COMP>
   PortableServer::Servant Dynamic_Component_Servant
     <COMP_SVNT, COMP_EXEC, COMP_EXEC_VAR,
-     EXEC, EXEC_VAR, COMP>::create (PortableServer::ObjectId &oid)
+     EXEC, EXEC_VAR, COMP>::create (PortableServer::ObjectId &oid
+                                    ACE_ENV_ARG_DECL)
   {
     CIAO::Swap_Exec_var swap_exec =
       CIAO::Swap_Exec::_narrow (this->executor_.in ()
                                 ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (COMP::_nil ());
+    ACE_CHECK_RETURN (0);
 
     ::Components::EnterpriseComponent_var ciao_ec =
       swap_exec->incarnate (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK_RETURN (COMP::_nil ());
+    ACE_CHECK_RETURN (0);
 
     COMP_EXEC_VAR ciao_comp =
       COMP_EXEC::_narrow (ciao_ec.in ()
                           ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (COMP::_nil ());
+    ACE_CHECK_RETURN (0);
 
     /// @@ Jai, should you be using ACE_NEW_THROW_EX here?
     COMP_SVNT *svt = new COMP_SVNT(ciao_comp.in (), this->home_.in (),
diff --git a/TAO/CIAO/DAnCE/ciao/Dynamic_Component_Servant_T.h b/TAO/CIAO/DAnCE/ciao/Dynamic_Component_Servant_T.h
index 38bc9322314..d041d77b9e0 100644
--- a/TAO/CIAO/DAnCE/ciao/Dynamic_Component_Servant_T.h
+++ b/TAO/CIAO/DAnCE/ciao/Dynamic_Component_Servant_T.h
@@ -46,7 +46,8 @@ namespace CIAO
     virtual ~Dynamic_Component_Servant (void);
 
     virtual PortableServer::Servant
-      create (PortableServer::ObjectId &oid);
+      create (PortableServer::ObjectId &oid
+              ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
     virtual void destroy (PortableServer::ObjectId &oid);
 
diff --git a/TAO/CIAO/DAnCE/ciao/Home_Servant_Impl_T.cpp b/TAO/CIAO/DAnCE/ciao/Home_Servant_Impl_T.cpp
index d10336225bd..92a792066c2 100644
--- a/TAO/CIAO/DAnCE/ciao/Home_Servant_Impl_T.cpp
+++ b/TAO/CIAO/DAnCE/ciao/Home_Servant_Impl_T.cpp
@@ -267,7 +267,7 @@ namespace CIAO
     Components::CCMObject_var ccmobjref =
       Components::CCMObject::_narrow (objref.in ()
                                       ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (Components::CCMObject::_nil ());
+    ACE_CHECK_RETURN (COMP::_nil ());
 
     this->objref_map_.bind (oid.in (),
       Components::CCMObject::_duplicate (ccmobjref.in ()));
diff --git a/TAO/CIAO/DAnCE/ciao/Servant_Impl_T.cpp b/TAO/CIAO/DAnCE/ciao/Servant_Impl_T.cpp
index 7aee4159153..e4e4670300c 100644
--- a/TAO/CIAO/DAnCE/ciao/Servant_Impl_T.cpp
+++ b/TAO/CIAO/DAnCE/ciao/Servant_Impl_T.cpp
@@ -112,7 +112,7 @@ namespace CIAO
           this->executor_.in ()
           ACE_ENV_ARG_PARAMETER
         );
-    ACE_CHECK;
+    ACE_CHECK_RETURN (Components::SessionComponent::_nil ());
     return temp._retn ();
   }
 
diff --git a/TAO/CIAO/DAnCE/ciao/Swapping_Servant_Home_Impl_T.cpp b/TAO/CIAO/DAnCE/ciao/Swapping_Servant_Home_Impl_T.cpp
index df1449af49b..e0d92b19044 100644
--- a/TAO/CIAO/DAnCE/ciao/Swapping_Servant_Home_Impl_T.cpp
+++ b/TAO/CIAO/DAnCE/ciao/Swapping_Servant_Home_Impl_T.cpp
@@ -46,7 +46,7 @@ namespace CIAO
                     COMP_VAR,
                     COMP_EXEC,
                     COMP_EXEC_VAR,
-                    COMP_SVNT>::~Swapping_Home_Servant_Impl (void)
+                    COMP_SVNT>::~Swapping_Home_Servant_Impl ()
   {
     const DYNAMIC_SERVANT_MAP_ITERATOR end = 
       this->dynamic_servant_map_.end ();
@@ -54,7 +54,17 @@ namespace CIAO
     PortableServer::ObjectId_var oid =
       PortableServer::string_to_ObjectId (this->obj_id_);
 
-    this->container_->delete_servant_map (oid);
+    ACE_TRY_NEW_ENV;
+      {
+        this->container_->delete_servant_map (oid ACE_ENV_ARG_PARAMETER);
+        ACE_TRY_CHECK;
+      }
+      ACE_CATCHANY;
+      {
+        ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+                             "~Swapping_Home_Servant_Impl\t\n");
+      }
+    ACE_ENDTRY;
 
     for (DYNAMIC_SERVANT_MAP_ITERATOR iter = 
            this->dynamic_servant_map_.begin ();
@@ -84,7 +94,7 @@ namespace CIAO
                     COMP_EXEC_VAR,
                     COMP_SVNT>::remove_component (
       ::Components::CCMObject_ptr 
-      ACE_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL_NOT_USED
     )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Components::RemoveFailure))
@@ -208,14 +218,14 @@ namespace CIAO
         this->repo_id_,
         Container::Component
         ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (CORBA::Object::_nil ());
+    ACE_CHECK_RETURN (COMP::_nil ());
 
     Dynamic_Component_Servant_Base *svt =
       new Dynamic_Component_Servant
        <COMP_SVNT, COMP_EXEC, COMP_EXEC_VAR, EXEC, EXEC_VAR, COMP>
           (ec, home, this, this->container_);
 
-    this->container_->add_servant_map (oid, svt);
+    this->container_->add_servant_map (oid, svt ACE_ENV_ARG_PARAMETER);
 
     this->dynamic_servant_map_.bind (oid, svt);
 
diff --git a/TAO/CIAO/DAnCE/ciao/Upgradeable_Context_Impl_T.cpp b/TAO/CIAO/DAnCE/ciao/Upgradeable_Context_Impl_T.cpp
index 631927a98c7..4ef653dc43e 100644
--- a/TAO/CIAO/DAnCE/ciao/Upgradeable_Context_Impl_T.cpp
+++ b/TAO/CIAO/DAnCE/ciao/Upgradeable_Context_Impl_T.cpp
@@ -37,14 +37,14 @@ namespace CIAO
   void
   Upgradeable_Context_Impl<BASE_CTX, SVNT, COMP, COMP_VAR>::deactivate_facet (
       const char* obj_id
-      ACE_ENV_SINGLE_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
     PortableServer::ObjectId_var oid =
         PortableServer::string_to_ObjectId (obj_id);
 
-    this->container_->deactivate_facet (oid);
+    this->container_->deactivate_facet (oid ACE_ENV_ARG_PARAMETER);
   }
 
   template <typename BASE_CTX, 
@@ -55,14 +55,14 @@ namespace CIAO
   Upgradeable_Context_Impl<BASE_CTX, SVNT, COMP, COMP_VAR>::
      update_port_activator (
            const char* obj_id
-           ACE_ENV_SINGLE_ARG_DECL)
+           ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
     PortableServer::ObjectId_var oid =
         PortableServer::string_to_ObjectId (obj_id);
     CIAO::Servant_Activator *sa =
         this->container_->ports_servant_activator ();
-    sa->update_port_activator (oid);
+    sa->update_port_activator (oid ACE_ENV_ARG_PARAMETER);
   }
 
 }