This commit was manufactured by cvs2svn to create tagami_phase3_end

'ami_phase3_end'.

1 files changed, 6 insertions, 7 deletions

diff --git a/TAO/examples/Simple/grid/server.cpp b/TAO/examples/Simple/grid/server.cpp
index e721da11e9f..0d31fd11cef 100644
--- a/TAO/examples/Simple/grid/server.cpp
+++ b/TAO/examples/Simple/grid/server.cpp
@@ -27,20 +27,19 @@ main (int argc, char *argv[])
           ACE_TRY_CHECK;
         }
     }
-  ACE_CATCH (CORBA::UserException, userex)
+  ACE_CATCH (CORBA::SystemException, sysex)
     {
-      //ACE_UNUSED_ARG (userex);
-      ACE_PRINT_EXCEPTION (userex, "User Exception in main");
+      ACE_UNUSED_ARG (sysex);
+      ACE_TRY_ENV.print_exception ("System Exception");
       return -1;
     }
-  ACE_CATCH (CORBA::SystemException, sysex)
+  ACE_CATCH (CORBA::UserException, userex)
     {
-      //ACE_UNUSED_ARG (sysex);
-      ACE_PRINT_EXCEPTION (sysex, "System Exception in main ");
+      ACE_UNUSED_ARG (userex);
+      ACE_TRY_ENV.print_exception ("User Exception");
       return -1;
     }
   ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   return 0;
 }