Fri Feb 2 15:09:14 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>

22 files changed, 134 insertions, 148 deletions

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index 6b02578885b..19ab96bc8df 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,28 @@
+Fri Feb  2 15:09:14 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ciao/Container_Base.cpp:
+        * ciao/Context_Impl_Base.cpp:
+        * ciao/Context_Impl_T.cpp:
+        * ciao/Home_Servant_Impl_Base.cpp:
+        * ciao/Home_Servant_Impl_T.cpp:
+        * ciao/Port_Activator_T.cpp:
+        * ciao/Servant_Activator.cpp:
+        * ciao/Servant_Impl_Base.cpp:
+        * ciao/Servant_Impl_T.cpp:
+        * ciao/Swapping_Servant_Home_Impl_Base.cpp:
+        * ciao/Swapping_Servant_Home_Impl_T.cpp:
+        * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp:
+        * DAnCE/NodeApplication/Container_Impl.cpp:
+        * DAnCE/NodeApplication/NodeApplication_Impl.cpp:
+        * DAnCE/NodeApplication/RTConfig_Manager.cpp:
+        * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp:
+        * DAnCE/NodeManager/NodeManager_Impl.cpp:
+        * DAnCE/RepositoryManager/RepositoryManager_Impl.cpp:
+        * docs/templates/CIAO_Glue_Session_Template.cpp:
+        * docs/templates/CIAO_Glue_Session_Template.inl:
+        * docs/tutorials/Quoter/Simple/Distributor/Distributor_exec.cpp:
+          Replaced ACE_THROW_RETURN with throw
+
 Fri Feb  2 13:28:14 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * DAnCE/tests/NodeApplicationTest/NodeApp_test_client.cpp:
diff --git a/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp b/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp
index 89dd9a3179e..0b2cd68766b 100644
--- a/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp
+++ b/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp
@@ -1260,10 +1260,9 @@ handle_es_connection (
       error += instname;
       error += ": unable to find object reference for connection ";
       error += binding.name.in ();
-      ACE_THROW_RETURN (Deployment::StartError
-        ("DomainApplicationManager_Impl::create_connections_i",
-                      error.c_str ()),
-                      false);
+      throw Deployment::StartError(
+        "DomainApplicationManager_Impl::create_connections_i",
+        error.c_str ());
     }
 
   retv[len].event_service = es._retn ();
@@ -1299,10 +1298,9 @@ handle_es_connection (
           error += instname;
           error += ": unable to find object reference for connection ";
           error += binding.name.in ();
-          ACE_THROW_RETURN (Deployment::StartError
-            ("DomainApplicationManager_Impl::handle_es_connection",
-                          error.c_str ()),
-                          false);
+          throw Deployment::StartError(
+            "DomainApplicationManager_Impl::handle_es_connection",
+            error.c_str ());
         }
     }
 
@@ -1390,10 +1388,9 @@ handle_direct_connection (
               error += instname;
               error += ": unable to find object reference for connection ";
               error += binding.name.in ();
-              ACE_THROW_RETURN (Deployment::StartError
-                ("DomainApplicationManager_Impl::create_connections_i",
-                              error.c_str ()),
-                              false);
+              throw Deployment::StartError(
+                "DomainApplicationManager_Impl::create_connections_i",
+                error.c_str ());
             }
           break;
         }
diff --git a/CIAO/DAnCE/NodeApplication/Container_Impl.cpp b/CIAO/DAnCE/NodeApplication/Container_Impl.cpp
index 89cab7af662..5b0a8f6e47e 100644
--- a/CIAO/DAnCE/NodeApplication/Container_Impl.cpp
+++ b/CIAO/DAnCE/NodeApplication/Container_Impl.cpp
@@ -308,8 +308,7 @@ CIAO::Container_Impl::install_home (
                   "error in binding home for component "
                   "instance [%s] \n",
                   impl_info.component_instance_name.in ()));
-      ACE_THROW_RETURN (Deployment::InstallationFailure (),
-                        Components::CCMHome::_nil ());
+      throw Deployment::InstallationFailure ();
     }
 
   //Note: If the return value will be discarded, it must be kept in a var or
diff --git a/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.cpp b/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.cpp
index afbb5c9bcc6..97c29a67882 100644
--- a/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.cpp
+++ b/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.cpp
@@ -616,7 +616,7 @@ ACE_THROW_SPEC ((::CORBA::SystemException,
 			        if (retv == false)
 			        {
 				        ACE_DEBUG ((LM_ERROR, "RTEC failed to create addr serv object\t\n"));
-				        ACE_THROW_RETURN (::Deployment::InstallationFailure (), 0);
+				        throw ::Deployment::InstallationFailure ();
 			        }
 		        }
 
@@ -629,7 +629,7 @@ ACE_THROW_SPEC ((::CORBA::SystemException,
 			        if (retv == false)
 			        {
 				        ACE_DEBUG ((LM_ERROR, "RTEC failed to create UDP sender object\t\n"));
-				        ACE_THROW_RETURN (::Deployment::InstallationFailure (), 0);
+				        throw ::Deployment::InstallationFailure ();
 			        }
 		        }
 
@@ -644,7 +644,7 @@ ACE_THROW_SPEC ((::CORBA::SystemException,
 			        if (retv == false)
 			        {
 				        ACE_DEBUG ((LM_ERROR, "RTEC failed to create UDP receiver object\t\n"));
-				        ACE_THROW_RETURN (::Deployment::InstallationFailure (), 0);
+				        throw ::Deployment::InstallationFailure ();
 			        }
 		        }
         }
@@ -653,7 +653,7 @@ ACE_THROW_SPEC ((::CORBA::SystemException,
   catch (const CORBA::Exception& ex)
     {
       ex._tao_print_exception ("NodeApplication_Impl::finishLaunch\t\n");
-      ACE_THROW_RETURN (::Deployment::InstallationFailure (), 0);
+      throw ::Deployment::InstallationFailure ();
     }
 
 }
diff --git a/CIAO/DAnCE/NodeApplication/RTConfig_Manager.cpp b/CIAO/DAnCE/NodeApplication/RTConfig_Manager.cpp
index b0dfb8a9ac0..ebca9127ecc 100644
--- a/CIAO/DAnCE/NodeApplication/RTConfig_Manager.cpp
+++ b/CIAO/DAnCE/NodeApplication/RTConfig_Manager.cpp
@@ -300,7 +300,7 @@ CIAO::RTResource_Config_Manager::find_threadpool_by_name (const char *name)
     {
       ACE_ERROR ((LM_ERROR,
                   "Invalid name string found in \"find_threadpool_by_name\"\n"));
-      ACE_THROW_RETURN (CORBA::BAD_PARAM (), 0);
+      throw CORBA::BAD_PARAM ();
     }
 
 
@@ -311,7 +311,7 @@ CIAO::RTResource_Config_Manager::find_threadpool_by_name (const char *name)
       ACE_ERROR ((LM_ERROR,
                   "Unable to find a threadpool named %s\n",
                   name));
-      ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+      throw CORBA::INTERNAL ();
     }
 
   return ret_id;
@@ -325,7 +325,7 @@ CIAO::RTResource_Config_Manager::find_priority_bands_by_name (const char *name)
     {
       ACE_ERROR ((LM_ERROR,
                   "Invalid name string found in \"find_priority_bands_by_name\"\n"));
-      ACE_THROW_RETURN (CORBA::BAD_PARAM (), 0);
+      throw CORBA::BAD_PARAM ();
     }
 
   PB_MAP::ENTRY *entry = 0;
@@ -335,7 +335,7 @@ CIAO::RTResource_Config_Manager::find_priority_bands_by_name (const char *name)
       ACE_ERROR ((LM_ERROR,
                   "Unable to find a connection bands named %s\n",
                   name));
-      ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+      throw CORBA::INTERNAL ();
     }
 
   RTCORBA::PriorityBands_var retv = new RTCORBA::PriorityBands;
@@ -351,7 +351,7 @@ CIAO::RTResource_Config_Manager::find_policies_by_name (const char *name)
     {
       ACE_ERROR ((LM_ERROR,
                   "Invalid name string found in \"find_policies_by_name\"\n"));
-      ACE_THROW_RETURN (CORBA::BAD_PARAM (), 0);
+      throw CORBA::BAD_PARAM ();
     }
 
 
@@ -365,7 +365,7 @@ CIAO::RTResource_Config_Manager::find_policies_by_name (const char *name)
       ACE_ERROR ((LM_ERROR,
                   "Unable to find a PolicyList named %s\n",
                   name));
-      ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+      throw CORBA::INTERNAL ();
     }
 
   // duplicate the sequence PolicyList.
@@ -440,7 +440,7 @@ CIAO::RTResource_Config_Manager::create_single_policy
     default:
       ACE_ERROR ((LM_ERROR,
                   "Invalid policy type - RTPolicy_Set_Manager::create_single_policy\n"));
-      ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+      throw CORBA::INTERNAL ();
     }
 
   return retv._retn ();
diff --git a/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp b/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp
index 51f6cbdb50e..3c26013ef9f 100644
--- a/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp
+++ b/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp
@@ -359,21 +359,15 @@ startLaunch (const Deployment::Properties & configProperty,
     }
   catch (const Deployment::UnknownImplId& e)
     {
-      ACE_THROW_RETURN (Deployment::StartError (e.name.in (),
-                                                e.reason.in ()),
-                        Deployment::Application::_nil());
+      throw Deployment::StartError (e.name.in (), e.reason.in ());
     }
   catch (const Deployment::ImplEntryPointNotFound& e)
     {
-      ACE_THROW_RETURN (Deployment::StartError (e.name.in (),
-                                                e.reason.in ()),
-                        Deployment::Application::_nil());
+      throw Deployment::StartError (e.name.in (), e.reason.in ());
     }
   catch (const Deployment::InstallationFailure& e)
     {
-      ACE_THROW_RETURN (Deployment::StartError (e.name.in (),
-                                                e.reason.in ()),
-                        Deployment::Application::_nil());
+      throw Deployment::StartError (e.name.in (), e.reason.in ());
     }
 
   return Deployment::NodeApplication::_duplicate (this->nodeapp_.in ());
@@ -506,21 +500,15 @@ perform_redeployment (const Deployment::Properties & configProperty,
     }
   catch (const Deployment::UnknownImplId& e)
     {
-      ACE_THROW_RETURN (Deployment::UnknownImplId (e.name.in (),
-                                                   e.reason.in ()),
-                        Deployment::Application::_nil());
+      throw Deployment::UnknownImplId (e.name.in (), e.reason.in ());
     }
   catch (const Deployment::ImplEntryPointNotFound& e)
     {
-      ACE_THROW_RETURN (Deployment::ImplEntryPointNotFound (e.name.in (),
-                                                            e.reason.in ()),
-                        Deployment::Application::_nil());
+      throw Deployment::ImplEntryPointNotFound (e.name.in (), e.reason.in ());
     }
   catch (const Deployment::InstallationFailure& e)
     {
-      ACE_THROW_RETURN (Deployment::InstallationFailure (e.name.in (),
-                                                         e.reason.in ()),
-                        Deployment::Application::_nil());
+      throw Deployment::InstallationFailure (e.name.in (), e.reason.in ());
     }
 
   return Deployment::NodeApplication::_duplicate (this->nodeapp_.in ());
diff --git a/CIAO/DAnCE/NodeManager/NodeManager_Impl.cpp b/CIAO/DAnCE/NodeManager/NodeManager_Impl.cpp
index 5e8fea451cd..3a73cca2233 100644
--- a/CIAO/DAnCE/NodeManager/NodeManager_Impl.cpp
+++ b/CIAO/DAnCE/NodeManager/NodeManager_Impl.cpp
@@ -238,8 +238,7 @@ preparePlan (const Deployment::DeploymentPlan &plan)
                   "same component server must have the "
                   "same \"resourceName\" defined.\n"));
 
-      ACE_THROW_RETURN (Deployment::PlanError (),
-                        Deployment::NodeApplicationManager::_nil ());
+      throw Deployment::PlanError ();
     }
 
   // Update the reference count map based on the deployment plan input
@@ -348,8 +347,7 @@ preparePlan (const Deployment::DeploymentPlan &plan)
     }
   catch (const PortableServer::POA::ObjectNotActive&)
     {
-      ACE_THROW_RETURN (Deployment::StartError (),
-                        Deployment::NodeApplicationManager::_nil ());
+      throw Deployment::StartError ();
     }
   catch (const CORBA::Exception& ex)
     {
diff --git a/CIAO/DAnCE/RepositoryManager/RepositoryManager_Impl.cpp b/CIAO/DAnCE/RepositoryManager/RepositoryManager_Impl.cpp
index 91aa4e47460..d98d9405588 100644
--- a/CIAO/DAnCE/RepositoryManager/RepositoryManager_Impl.cpp
+++ b/CIAO/DAnCE/RepositoryManager/RepositoryManager_Impl.cpp
@@ -591,7 +591,7 @@ CIAO_RepositoryManagerDaemon_i::findPackageByName (const char * name)
 
 
   if(!RM_Helper::reincarnate (pc, pc_path.c_str ()))
-    ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+    throw CORBA::INTERNAL ();
 
   ACE_DEBUG ((LM_INFO, "Successfully looked up \'%s\'.\n", name));
 
@@ -631,7 +631,7 @@ CIAO_RepositoryManagerDaemon_i::findPackageByUUID (const char * UUID)
 
 
   if(!RM_Helper::reincarnate (pc, pc_path.c_str ()))
-    ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+    throw CORBA::INTERNAL ();
 
   ACE_DEBUG ((LM_INFO, "Successfully looked up %s.\n", UUID));
 
diff --git a/CIAO/ciao/Container_Base.cpp b/CIAO/ciao/Container_Base.cpp
index 63507fede32..593757bc493 100644
--- a/CIAO/ciao/Container_Base.cpp
+++ b/CIAO/ciao/Container_Base.cpp
@@ -397,8 +397,7 @@ namespace CIAO
             || static_entrypts_maps_->home_creator_funcptr_map_ == 0
             || static_entrypts_maps_->home_servant_creator_funcptr_map_ == 0)
           {
-            ACE_THROW_RETURN (Deployment::ImplEntryPointNotFound (),
-                              Components::CCMHome::_nil ());
+            throw Deployment::ImplEntryPointNotFound ();
           }
 
         ACE_CString exe_entrypt_str (exe_entrypt);
@@ -574,7 +573,7 @@ namespace CIAO
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
     CIAO_TRACE ("Session_Container::get_home_objref");
-    ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
+    throw CORBA::NO_IMPLEMENT ();
   }
 
   CORBA::Object_ptr
diff --git a/CIAO/ciao/Context_Impl_Base.cpp b/CIAO/ciao/Context_Impl_Base.cpp
index 9c377124e60..72d99657c08 100644
--- a/CIAO/ciao/Context_Impl_Base.cpp
+++ b/CIAO/ciao/Context_Impl_Base.cpp
@@ -27,8 +27,7 @@ namespace CIAO
     )
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
-    ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (),
-                      Components::Principal::_nil ());
+    throw CORBA::NO_IMPLEMENT ();
   }
 
   Components::CCMHome_ptr
@@ -45,7 +44,7 @@ namespace CIAO
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Components::IllegalState))
   {
-    ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), false);
+    throw CORBA::NO_IMPLEMENT ();
   }
 
   Components::Transaction::UserTransaction_ptr
@@ -54,8 +53,7 @@ namespace CIAO
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Components::IllegalState))
   {
-    ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (),
-                      Components::Transaction::UserTransaction::_nil ());
+    throw CORBA::NO_IMPLEMENT ();
   }
 
   CORBA::Boolean
@@ -64,7 +62,7 @@ namespace CIAO
     )
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
-    ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), false);
+    throw CORBA::NO_IMPLEMENT ();
   }
 
   void
diff --git a/CIAO/ciao/Context_Impl_T.cpp b/CIAO/ciao/Context_Impl_T.cpp
index 94bc0ac65eb..3eb2df24cf3 100644
--- a/CIAO/ciao/Context_Impl_T.cpp
+++ b/CIAO/ciao/Context_Impl_T.cpp
@@ -60,8 +60,7 @@ namespace CIAO
 
       if (CORBA::is_nil (this->component_.in ()))
       {
-        ACE_THROW_RETURN (CORBA::INTERNAL (),
-                          CORBA::Object::_nil ());
+        throw CORBA::INTERNAL ();
       }
     }
 
diff --git a/CIAO/ciao/Home_Servant_Impl_Base.cpp b/CIAO/ciao/Home_Servant_Impl_Base.cpp
index f96c2ac684d..0cfd1ec9870 100644
--- a/CIAO/ciao/Home_Servant_Impl_Base.cpp
+++ b/CIAO/ciao/Home_Servant_Impl_Base.cpp
@@ -20,8 +20,7 @@ namespace CIAO
     )
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
-    ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (),
-                      CORBA::IRObject::_nil ());
+    throw CORBA::NO_IMPLEMENT ();
   }
 
   CORBA::IRObject_ptr
@@ -29,8 +28,7 @@ namespace CIAO
     )
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
-    ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (),
-                      CORBA::IRObject::_nil ());
+    throw CORBA::NO_IMPLEMENT ();
   }
 
 }
diff --git a/CIAO/ciao/Home_Servant_Impl_T.cpp b/CIAO/ciao/Home_Servant_Impl_T.cpp
index 5dc7e68243b..cfc7985e0c7 100644
--- a/CIAO/ciao/Home_Servant_Impl_T.cpp
+++ b/CIAO/ciao/Home_Servant_Impl_T.cpp
@@ -142,8 +142,7 @@ namespace CIAO
 
     if (this->executor_.in () == 0)
       {
-        ACE_THROW_RETURN (CORBA::INTERNAL (),
-                          COMP_SVNT::_stub_type::_nil ());
+        throw CORBA::INTERNAL ();
       }
 
     ::Components::EnterpriseComponent_var _ciao_ec =
diff --git a/CIAO/ciao/Port_Activator_T.cpp b/CIAO/ciao/Port_Activator_T.cpp
index b6bc950a642..1d5d35dd197 100644
--- a/CIAO/ciao/Port_Activator_T.cpp
+++ b/CIAO/ciao/Port_Activator_T.cpp
@@ -75,8 +75,7 @@ namespace CIAO
         return s;
       }
 
-    ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
-                      0);
+    throw CORBA::OBJECT_NOT_EXIST ();
   }
 }
 
diff --git a/CIAO/ciao/Servant_Activator.cpp b/CIAO/ciao/Servant_Activator.cpp
index c0e1bc93d9d..a43867a0185 100644
--- a/CIAO/ciao/Servant_Activator.cpp
+++ b/CIAO/ciao/Servant_Activator.cpp
@@ -91,8 +91,7 @@ namespace CIAO
       for (size_t t = 0; t != sz; ++t)
         {
           if (this->pa_.get (tmp, t) == -1)
-            ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
-                              0);
+            throw CORBA::OBJECT_NOT_EXIST ();
 
           if (tmp == 0)
             {
@@ -116,8 +115,7 @@ namespace CIAO
             }
         }
     }
-    ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
-                      0);
+    throw CORBA::OBJECT_NOT_EXIST ();
   }
 
   void
diff --git a/CIAO/ciao/Servant_Impl_Base.cpp b/CIAO/ciao/Servant_Impl_Base.cpp
index 7ea606c2c7b..a40c0a5d6f6 100644
--- a/CIAO/ciao/Servant_Impl_Base.cpp
+++ b/CIAO/ciao/Servant_Impl_Base.cpp
@@ -27,7 +27,7 @@ namespace CIAO
     ACE_THROW_SPEC ((CORBA::SystemException,
                      ::Components::NoKeyAvailable))
   {
-    ACE_THROW_RETURN (::Components::NoKeyAvailable (), 0);
+    throw ::Components::NoKeyAvailable ();
   }
 
   CORBA::IRObject_ptr
@@ -35,8 +35,7 @@ namespace CIAO
     )
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
-    ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (),
-                      CORBA::IRObject::_nil ());
+    throw CORBA::NO_IMPLEMENT ();
   }
 
   void
@@ -126,7 +125,7 @@ namespace CIAO
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Components::InvalidName))
   {
-    ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
+    throw CORBA::NO_IMPLEMENT ();
   }
 
   ::Components::ComponentPortDescription *
@@ -173,16 +172,14 @@ namespace CIAO
   {
     if (0 == name)
       {
-        ACE_THROW_RETURN (Components::InvalidName (),
-                          CORBA::Object::_nil ());
+        throw Components::InvalidName ();
       }
 
     CORBA::Object_ptr retval = this->lookup_facet (name);
 
     if (CORBA::is_nil (retval))
       {
-        ACE_THROW_RETURN (Components::InvalidName (),
-                          CORBA::Object::_nil ());
+        throw Components::InvalidName ();
       }
 
     return retval;
@@ -210,8 +207,7 @@ namespace CIAO
 
         if (0 == tmp)
           {
-            ACE_THROW_RETURN (Components::InvalidName (),
-                              0);
+            throw Components::InvalidName ();
           }
 
         safe_retval[i] = tmp;
@@ -284,8 +280,7 @@ namespace CIAO
   {
     if (0 == sink_name)
       {
-        ACE_THROW_RETURN (Components::InvalidName (),
-                          Components::EventConsumerBase::_nil ());
+        throw Components::InvalidName ();
       }
 
     Components::EventConsumerBase_ptr retval =
@@ -293,8 +288,7 @@ namespace CIAO
 
     if (CORBA::is_nil (retval))
       {
-        ACE_THROW_RETURN (Components::InvalidName (),
-                          Components::EventConsumerBase::_nil ());
+        throw Components::InvalidName ();
       }
 
     return retval;
@@ -322,8 +316,7 @@ namespace CIAO
 
         if (0 == tmp)
           {
-            ACE_THROW_RETURN (Components::InvalidName (),
-                              0);
+            throw Components::InvalidName ();
           }
 
         safe_retval[i] = tmp;
@@ -339,7 +332,7 @@ namespace CIAO
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Components::InvalidName))
   {
-    ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
+    throw CORBA::NO_IMPLEMENT ();
   }
 
   ::Components::ReceptacleDescriptions *
@@ -383,7 +376,7 @@ namespace CIAO
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Components::InvalidName))
   {
-    ACE_THROW_RETURN (::CORBA::NO_IMPLEMENT (), 0);
+    throw ::CORBA::NO_IMPLEMENT ();
   }
 
   ::Components::PublisherDescriptions *
@@ -393,7 +386,7 @@ namespace CIAO
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Components::InvalidName))
   {
-    ACE_THROW_RETURN (::CORBA::NO_IMPLEMENT (), 0);
+    throw ::CORBA::NO_IMPLEMENT ();
   }
 
   /// Protected operations.
diff --git a/CIAO/ciao/Servant_Impl_T.cpp b/CIAO/ciao/Servant_Impl_T.cpp
index 8925ce3b213..719d0e51513 100644
--- a/CIAO/ciao/Servant_Impl_T.cpp
+++ b/CIAO/ciao/Servant_Impl_T.cpp
@@ -66,7 +66,7 @@ namespace CIAO
   {
     if (::CORBA::is_nil (object_ref))
       {
-        ACE_THROW_RETURN (::CORBA::BAD_PARAM (), 0);
+        throw ::CORBA::BAD_PARAM ();
       }
 
     ::CORBA::Object_var the_other =
@@ -133,8 +133,7 @@ namespace CIAO
         return ec->get_CCM_object ();
       }
 
-    ACE_THROW_RETURN (CORBA::INTERNAL (),
-                      ::CORBA::Object::_nil ());
+    throw CORBA::INTERNAL ();
   }
 
   // CIAO-specific operations.
diff --git a/CIAO/ciao/Swapping_Servant_Home_Impl_Base.cpp b/CIAO/ciao/Swapping_Servant_Home_Impl_Base.cpp
index 7b357c1a882..e85da4386d4 100644
--- a/CIAO/ciao/Swapping_Servant_Home_Impl_Base.cpp
+++ b/CIAO/ciao/Swapping_Servant_Home_Impl_Base.cpp
@@ -20,16 +20,14 @@ namespace CIAO
   Swapping_Home_Servant_Impl_Base::get_component_def (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
-    ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (),
-                      CORBA::IRObject::_nil ());
+    throw CORBA::NO_IMPLEMENT ();
   }
 
   CORBA::IRObject_ptr
   Swapping_Home_Servant_Impl_Base::get_home_def (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
-    ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (),
-                      CORBA::IRObject::_nil ());
+    throw CORBA::NO_IMPLEMENT ();
   }
 
 }
diff --git a/CIAO/ciao/Swapping_Servant_Home_Impl_T.cpp b/CIAO/ciao/Swapping_Servant_Home_Impl_T.cpp
index a349718949e..948f9d7c81a 100644
--- a/CIAO/ciao/Swapping_Servant_Home_Impl_T.cpp
+++ b/CIAO/ciao/Swapping_Servant_Home_Impl_T.cpp
@@ -113,8 +113,7 @@ namespace CIAO
   {
     if (this->executor_.in () == 0)
     {
-      ACE_THROW_RETURN (CORBA::INTERNAL (),
-                        COMP_SVNT::_stub_type::_nil ());
+      throw CORBA::INTERNAL ();
     }
 
 
diff --git a/CIAO/docs/templates/CIAO_Glue_Session_Template.cpp b/CIAO/docs/templates/CIAO_Glue_Session_Template.cpp
index aedbcd3769b..94ca816356d 100644
--- a/CIAO/docs/templates/CIAO_Glue_Session_Template.cpp
+++ b/CIAO/docs/templates/CIAO_Glue_Session_Template.cpp
@@ -48,7 +48,7 @@ CORBA::Object_ptr
   if (! CORBA::is_nil(ec.in ()))
     return ec->get_CCM_object ();
 
-  ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+  throw CORBA::INTERNAL ();
 }
 
 ##end foreach [facet type]
@@ -126,7 +126,7 @@ void
                    ::Components::ExceededConnectionLimit))
 {
   if (CORBA::is_nil (c))
-    ACE_THROW_RETURN (CORBA::BAD_PARAM (), 0);
+    throw CORBA::BAD_PARAM ();
 
   [eventtype]Consumer_var sub
     = [eventtype]Consumer::_duplicate (c);
@@ -151,11 +151,11 @@ void
   ACE_Active_Map_Manager_Key key;
   if (ck == 0 ||
       CIAO::Map_Key_Cookie::extract (ck, key) == -1)
-    ACE_THROW_RETURN (::Components::InvalidConnection (), 0);
+    throw ::Components::InvalidConnection ();
 
   if (this->ciao_publishes_[publish name]_map_.unbind (key,
                                                        retv) != 0)
-    ACE_THROW_RETURN (::Components::InvalidConnection (), 0);
+    throw ::Components::InvalidConnection ();
 
   return retv._retn ();
 }
@@ -210,7 +210,7 @@ void
                        ::Components::InvalidConnection))
 {
   if (CORBA::is_nil (c))
-    ACE_THROW_RETURN (::Components::InvalidConnection (), 0);
+    throw ::Components::InvalidConnection ();
 
   [uses type]_var conn
     = [uses type]::_duplicate (c);
@@ -235,11 +235,11 @@ void
   ACE_Active_Map_Manager_Key key;
   if (ck == 0 ||
       CIAO::Map_Key_Cookie::extract (ck, key) == -1)
-    ACE_THROW_RETURN (::Components::InvalidConnection (), 0);
+    throw ::Components::InvalidConnection ();
 
   if (this->ciao_muses_[receptacle name]_.unbind (key,
                                                   retv) != 0)
-    ACE_THROW_RETURN (::Components::InvalidConnection (), 0);
+    throw ::Components::InvalidConnection ();
 
   return retv._retn ();
 }
@@ -264,7 +264,7 @@ CORBA::Object_ptr
       this->component_ = [component name]::_narrow (obj.in ());
 
       if (CORBA::is_nil (this->component_.in ()))
-        ACE_THROW_RETURN (CORBA::INTERNAL (), 0); // This should not happen...
+        throw CORBA::INTERNAL (); // This should not happen...
     }
   return [component name]::_duplicate (this->component_.in ());
 }
@@ -326,7 +326,7 @@ CORBA::Object_ptr
       CCM_[facet type]_var fexe = this->executor_->get_[facet name] ();
 
       if (CORBA::is_nil (fexe.in ()))
-        ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+        throw CORBA::INTERNAL ();
 
       [ciao module name]::[facet type]_Servant *svt =
         new [ciao module name]::[facet type]_Servant (fexe.in (),
@@ -398,7 +398,7 @@ CORBA::Object_ptr
                    Components::InvalidName))
 {
   if (name == 0)
-    ACE_THROW_RETURN (CORBA::BAD_PARAM (), 0);
+    throw CORBA::BAD_PARAM ();
 
   // We simply iterate thru all the facets this component provides
   // now.  We can also use a hash map along with perfect hashing
@@ -410,7 +410,7 @@ CORBA::Object_ptr
     return this->provide_[facet name] ();
 ##end foreach [facet name] with [facet type]
 
-  ACE_THROW_RETURN (::Components::InvalidName (), 0);
+  throw ::Components::InvalidName ();
 }
 
 ::Components::FacetDescriptions *
@@ -467,7 +467,7 @@ CORBA::Object_ptr
         }
 ##end foreach [facet name] with [facet type]
       else
-        ACE_THROW_RETURN (::Components::InvalidName (), 0);
+        throw ::Components::InvalidName ();
 
       collection[i] = x._retn ();
     }
@@ -479,7 +479,7 @@ CORBA::Boolean
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (CORBA::is_nil (object_ref))
-    ACE_THROW_RETURN (CORBA::BAD_PARAM (), 0);
+    throw CORBA::BAD_PARAM ();
 
   CORBA::Object_var the_other = object_ref->_get_component ();
 
@@ -500,7 +500,7 @@ CORBA::Boolean
 {
   // @@ We can omit this if clause if there's no receptacle in this component.
   if (name == 0)
-    ACE_THROW_RETURN (Components::InvalidName (), 0);
+    throw Components::InvalidName ();
 
 ##foreach [receptacle name] with [uses type] in (list of all 'uses' interfaces) generate:
   if (ACE_OS_String::strcmp (name, "[receptacle name]") == 0)
@@ -509,7 +509,7 @@ CORBA::Boolean
         [uses type]::_narrow (connection);
 
       if (CORBA::is_nil (_ciao_conn.in ()))
-        ACE_THROW_RETURN (::Components::InvalidConnection (), 0);
+        throw ::Components::InvalidConnection ();
 
 ##  if [receptacle name] is a simplex receptacle ('uses')
       this->connect_[receptacle name] (_caio_conn.in ());
@@ -520,7 +520,7 @@ CORBA::Boolean
     }
 ##end foreach [receptacle name] with [uses type]
 
-  ACE_THROW_RETURN (Components::InvalidName (), 0);
+  throw Components::InvalidName ();
 }
 
 /*
@@ -542,7 +542,7 @@ CORBA::Object_ptr
 {
   // @@ We can omit this if clause if there's no receptacle in this component.
   if (name == 0)
-    ACE_THROW_RETURN (Components::InvalidName (), 0);
+    throw Components::InvalidName ();
 
 ##foreach [receptacle name] with [uses type] in (list of all 'uses' interfaces) generate:
   if (ACE_OS_String::strcmp (name, "[receptacle name]") == 0)
@@ -553,7 +553,7 @@ CORBA::Object_ptr
 ##  endif [receptacle name]
 ##end foreach [receptacle name] with [uses type]
 
-  ACE_THROW_RETURN (Components::InvalidName (), 0);
+  throw Components::InvalidName ();
 }
 
 ::Components::ConnectionDescriptions *
@@ -563,7 +563,7 @@ CORBA::Object_ptr
 {
   // @@ We can omit this if clause if there's no receptacle in this component.
   if (name == 0)
-    ACE_THROW_RETURN (Components::InvalidName (), 0);
+    throw Components::InvalidName ();
 
 ##foreach [receptacle name] with [uses type] in (list of all 'uses' interfaces) generate:
   if (ACE_OS_String::strcmp (name, "[receptacle name]") == 0)
@@ -585,7 +585,7 @@ CORBA::Object_ptr
     }
 ##end foreach [receptacle name] with [uses type]
 
-  ACE_THROW_RETURN (Components::InvalidName (), 0);
+  throw Components::InvalidName ();
 }
 
 ::Components::ReceptacleDescriptions *
@@ -642,7 +642,7 @@ CORBA::Object_ptr
         }
 ##end foreach [receptacle name] with [uses type]
       else
-        ACE_THROW_RETURN (::Components::InvalidName (), 0);
+        throw ::Components::InvalidName ();
     }
   return retv._retn ();
 }
@@ -655,13 +655,13 @@ CORBA::Object_ptr
 {
   // @@ We can omit this if clause if there's no event sinks in this component.
   if (sink_name == 0)
-    ACE_THROW_RETURN (Components::InvalidName (), 0);
+    throw Components::InvalidName ();
 
 ##foreach [consumer name] with [eventtype] in (list of all consumers) generate:
   if (ACE_OS_String::strcmp (sink_name, "[consumer name]") == 0)
     return this->get_consumer_[consumer name] ();
 ##end foreach [consumer name] with [eventtype]
-  ACE_THROW_RETURN (Components::InvalidName (), 0);
+  throw Components::InvalidName ();
 }
 
 ::Components::Cookie *
@@ -674,7 +674,7 @@ CORBA::Object_ptr
 {
   // @@ We can omit this if clause if there's no publisher in this component.
   if (publisher_name == 0)
-    ACE_THROW_RETURN (Components::InvalidName (), 0);
+    throw Components::InvalidName ();
 
 ##foreach [publish name] with [eventtype] in (list of all publishers) generate:
   if (ACE_OS_String::strcmp (publisher_name, "[publish name]") == 0)
@@ -683,13 +683,13 @@ CORBA::Object_ptr
         [eventtype]Consumer::_narrow (subscriber);
 
       if (CORBA::is_nil (_ciao_consumer.in ()))
-        ACE_THROW_RETURN (Components::InvalidConnection (), 0);
+        throw Components::InvalidConnection ();
 
       return this->subscribe_[publish name] (_ciao_consumer.in ());
     }
 ##end foreach [publish name] with [eventtype]
 
-  ACE_THROW_RETURN (Components::InvalidName (), 0);
+  throw Components::InvalidName ();
 }
 
 ::Components::EventConsumerBase_ptr
@@ -701,7 +701,7 @@ CORBA::Object_ptr
 {
   // @@ We can omit this if clause if there's no publisher in this component.
   if (publisher_name == 0)
-    ACE_THROW_RETURN (Components::InvalidName (), 0);
+    throw Components::InvalidName ();
 
 ##foreach [publish name] with [eventtype] in (list of all publishers) generate:
   if (ACE_OS_String::strcmp (publisher_name, "[publish name]") == 0)
@@ -710,7 +710,7 @@ CORBA::Object_ptr
     }
 ##end foreach [publish name] with [eventtype]
 
-  ACE_THROW_RETURN (Components::InvalidName (), 0);
+  throw Components::InvalidName ();
 }
 
 void
@@ -750,7 +750,7 @@ void
 {
   // @@ We can omit this if clause if there's no emitter in this component.
   if (source_name == 0)
-    ACE_THROW_RETURN (Components::InvalidName (), 0);
+    throw Components::InvalidName ();
 
 ##foreach [emit name] with [eventtype] in (list of all emitters) generate:
   if (ACE_OS_String::strcmp (source_name, "[emit name]") == 0)
@@ -759,7 +759,7 @@ void
     }
 ##end foreach [emit name] with [eventtype]
 
-  ACE_THROW_RETURN (Components::InvalidName (), 0);
+  throw Components::InvalidName ();
 }
 
 ::Components::ConsumerDescriptions *
@@ -813,7 +813,7 @@ void
         }
 ##end foreach [consumer name] with [eventtype]
       else
-        ACE_THROW_RETURN (::Components::InvalidName (), 0);
+        throw ::Components::InvalidName ();
     }
   return retv._retn ();
 }
@@ -863,7 +863,7 @@ void
         }
 ##end foreach [consumer name] with [eventtype]
       else
-        ACE_THROW_RETURN (::Components::InvalidName (), 0);
+        throw ::Components::InvalidName ();
     }
   return retv._retn ();
 }
@@ -876,7 +876,7 @@ void
 
   // Need to add interfaces in the Context class to gather the information.
   // Or we can just relay it to the Context object.
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 ::Components::PublisherDescriptions *
@@ -888,7 +888,7 @@ void
 
   // Need to add interfaces in the Context class to gather the information.
   // Or we can just relay it to the Context object.
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 // Operations for CCMObject interface
@@ -897,7 +897,7 @@ void
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // @@ to-do: Connect to an IfR?
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 ::Components::CCMHome_ptr
@@ -913,7 +913,7 @@ void
                    Components::NoKeyAvailable))
 {
   // This is a keyless component.
-  ACE_THROW_RETURN (::Components::NoKeyAvailable (), 0);
+  throw ::Components::NoKeyAvailable ();
 }
 
 void
@@ -985,7 +985,7 @@ CORBA::Object_ptr
   if (! CORBA::is_nil(ec.in ()))
     return ec->get_CCM_object ();
 
-  ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+  throw CORBA::INTERNAL ();
 }
 
 void
@@ -1074,7 +1074,7 @@ void
                    Components::CreateFailure))
 {
   if (this->executor_.in () == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+    throw CORBA::INTERNAL ();
 
   Components::EnterpriseComponent_var _ciao_ec =
     this->executor_->create ();
diff --git a/CIAO/docs/templates/CIAO_Glue_Session_Template.inl b/CIAO/docs/templates/CIAO_Glue_Session_Template.inl
index 1cb07a064ae..af81f26317f 100644
--- a/CIAO/docs/templates/CIAO_Glue_Session_Template.inl
+++ b/CIAO/docs/templates/CIAO_Glue_Session_Template.inl
@@ -110,7 +110,7 @@ ACE_INLINE ::Components::Principal_ptr
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // @@ We don't support Security in CIAO yet.
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 ACE_INLINE ::Components::CCMHome_ptr
@@ -126,7 +126,7 @@ ACE_INLINE CORBA::Boolean
                    Components::IllegalState))
 {
   // @@ We don't support Transaction in CIAO yet.
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 ACE_INLINE ::Components::Transaction::UserTransaction_ptr
@@ -135,7 +135,7 @@ ACE_INLINE ::Components::Transaction::UserTransaction_ptr
                    Components::IllegalState))
 {
   // @@ We don't support Transaction in CIAO yet.
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 ACE_INLINE CORBA::Boolean
@@ -145,7 +145,7 @@ ACE_INLINE CORBA::Boolean
   ACE_UNUSED_ARG (role);
 
   // @@ We don't support Transaction in CIAO yet.
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 ACE_INLINE void
@@ -411,7 +411,7 @@ ACE_INLINE [component name]_ptr
 {
   // @@ TO-DO when we suppor keyed home.
 
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 ACE_INLINE [component name]_ptr
@@ -423,7 +423,7 @@ ACE_INLINE [component name]_ptr
 {
   // @@ TO-DO when we suppor keyed home.
 
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 
@@ -445,7 +445,7 @@ ACE_INLINE [key type] *
 {
   // @@ TO-DO when we suppor keyed home.
 
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 ##  endif (keyed or keyless home)
@@ -458,7 +458,7 @@ ACE_INLINE ::CORBA::IRObject_ptr
 {
   // @@ TO-DO.  Contact IfR?
 
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 ACE_INLINE CORBA::IRObject_ptr
@@ -467,5 +467,5 @@ ACE_INLINE CORBA::IRObject_ptr
 {
   // @@ TO-DO.  Contact IfR?
 
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
+  throw CORBA::NO_IMPLEMENT ();
 }
diff --git a/CIAO/docs/tutorials/Quoter/Simple/Distributor/Distributor_exec.cpp b/CIAO/docs/tutorials/Quoter/Simple/Distributor/Distributor_exec.cpp
index 1eaafa0027d..20ee228c967 100644
--- a/CIAO/docs/tutorials/Quoter/Simple/Distributor/Distributor_exec.cpp
+++ b/CIAO/docs/tutorials/Quoter/Simple/Distributor/Distributor_exec.cpp
@@ -167,7 +167,7 @@ namespace CIDL_StockDistributor_Impl
     }
     else
     {
-      ACE_THROW_RETURN (Stock::Invalid_Stock (), 0);
+      throw Stock::Invalid_Stock ();
     }
   }