1 files changed, 6 insertions, 11 deletions

diff --git a/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_cs.cpp b/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_cs.cpp
index ae6a393b103..ab4b371b3c3 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_cs.cpp
@@ -233,7 +233,7 @@ be_visitor_operation_ami_handler_reply_stub_operation_cs::visit_operation (be_op
       << "_tao_reply_handler_object->"
       << node->local_name () << "_excep (exception_holder_var";
 
-  if (!be_global->exception_support ())
+  if (!idl_global->exception_support ())
     *os << "," << be_nl << " ACE_TRY_ENV";
 
   *os << ");" << be_uidt_nl
@@ -301,17 +301,12 @@ be_visitor_operation_ami_handler_reply_stub_operation_cs::gen_raise_exception (
 
   if (this->void_return_type (bt))
     { 
-      if (be_global->use_raw_throw ())
-        *os << "throw ";
+      if (idl_global->use_raw_throw ())
+        *os << "throw (";
       else
         *os << "ACE_THROW (";
 
-      *os << excep << " (" << completion_status << ")";
-
-      if (be_global->use_raw_throw ())
-        *os << ";\n";
-      else
-        *os << ");\n";
+      *os << excep << " (" << completion_status << "));\n";
     }
   else
     {
@@ -501,8 +496,8 @@ be_compiled_visitor_operation_ami_handler_reply_stub_operation_cs::
 
       *os << be_uidt << be_uidt_nl
           << " ))" << be_nl;
-      if (be_global->use_raw_throw ())
-        *os << "throw CORBA::MARSHAL ();" << be_uidt_nl << be_nl;
+      if (idl_global->use_raw_throw ())
+        *os << "throw (CORBA::MARSHAL ());" << be_uidt_nl << be_nl;
       else
         *os << "ACE_THROW (CORBA::MARSHAL ());" << be_uidt_nl << be_nl;
     }