Fri Feb 2 16:16:14 2007 Johnny Willemsen <jwillemsen@remedy.nl>

1 files changed, 4 insertions, 6 deletions

diff --git a/TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.cpp b/TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.cpp
index bbb2430d7ee..bb6be70b13c 100644
--- a/TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.cpp
+++ b/TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.cpp
@@ -36,9 +36,8 @@ Criteria_Evaluator::getInitialization (void)
     this->getCriteriaMember ("initialization");
 
   if (any_ptr == 0)
-    ACE_THROW_RETURN (LifeCycleService::Criteria_Evaluator::NotAvailable
-                         ("No initialization member found.\n"),
-                      0);
+    throw LifeCycleService::Criteria_Evaluator::NotAvailable(
+      "No initialization member found.\n");
 
   *any_ptr >>= sequence_ptr;
 
@@ -53,9 +52,8 @@ Criteria_Evaluator::getFilter (void)
   CORBA::Any_ptr any_ptr = this->getCriteriaMember ("filter");
 
   if (any_ptr == 0)
-    ACE_THROW_RETURN (LifeCycleService::Criteria_Evaluator::NotAvailable
-                        ("No filter member found.\n"),
-                      0);
+    throw LifeCycleService::Criteria_Evaluator::NotAvailable(
+      "No filter member found.\n");
   *any_ptr >>= string;
   return CORBA::string_dup (string);
 }