ChangeLogTag: Wed Mar 27 09:23:42 2002 Jeff Parsons <parsons@cs.wustl.edu>

2 files changed, 18 insertions, 36 deletions

diff --git a/TAO/TAO_IDL/be/be_visitor_ami_pre_proc.cpp b/TAO/TAO_IDL/be/be_visitor_ami_pre_proc.cpp
index 8ef89524fa3..ed55e812afe 100644
--- a/TAO/TAO_IDL/be/be_visitor_ami_pre_proc.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_ami_pre_proc.cpp
@@ -683,10 +683,6 @@ be_visitor_ami_pre_proc::create_raise_operation (
   operation->set_name (op_name);
   operation->set_defined_in (excep_holder);
 
-// @@@ (JP) I don't think valuetype operations can throw any kind of
-// CORBA exception, since they're just local calls, so I'm commenting
-// this out for now.
-/*
   if (operation_kind == NORMAL)
     {
       if (orig_op)
@@ -699,7 +695,7 @@ be_visitor_ami_pre_proc::create_raise_operation (
             }
         }
     }
-*/
+
   // Set the proper strategy.
   be_operation_ami_exception_holder_raise_strategy *boaehrs = 0;
   ACE_NEW_RETURN (boaehrs,
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/operation.cpp b/TAO/TAO_IDL/be/be_visitor_operation/operation.cpp
index 4ba6d1ad816..c7361d72c35 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/operation.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/operation.cpp
@@ -123,46 +123,32 @@ be_visitor_operation::gen_throw_spec (be_operation *node)
     {
       *os << be_idt_nl << throw_spec_open;
       *os << be_idt_nl << "CORBA::SystemException";
-    }
-
-  if (node->exceptions ())
-    {
-      int i = 0;
 
-      // Initialize an iterator to iterate thru the exception list.
-      for (UTL_ExceptlistActiveIterator ei (node->exceptions ());
-           !ei.is_done ();
-           ei.next ())
+      if (node->exceptions ())
         {
-          be_exception *excp =
-            be_exception::narrow_from_decl (ei.item ());
-
-          if (excp == 0)
+          // Initialize an iterator to iterate thru the exception list.
+          for (UTL_ExceptlistActiveIterator ei (node->exceptions ());
+               !ei.is_done ();
+               ei.next ())
             {
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 "(%N:%l) be_visitor_operation"
-                                 "gen_throw_spec - "
-                                 "bad exception node\n"),
-                                -1);
+              be_exception *excp =
+                be_exception::narrow_from_decl (ei.item ());
 
-            }
+              if (excp == 0)
+                {
+                  ACE_ERROR_RETURN ((LM_ERROR,
+                                     "(%N:%l) be_visitor_operation"
+                                     "gen_throw_spec - "
+                                     "bad exception node\n"),
+                                    -1);
 
-          if (i != 0 || (iface != 0 && !iface->is_valuetype ()))
-            {
-              *os << be_nl << ", ";
-            }
+                }
 
-          if (iface != 0 && !iface->is_valuetype ())
-            {
+              *os << be_nl << ", ";
               *os << excp->name ();
-	    }
-          ++i;
+            }
         }
-    }
 
-  // Check if this is IF and it's not VT.
-  if (iface != 0 && !iface->is_valuetype ())
-    {
       *os << be_uidt_nl << throw_spec_close << be_uidt;
     }