Merge branch 'message_queue_ex_get_queue' of https://github.com/esohns/ACE_TAO into message_queue_ex_get_queue

1 files changed, 0 insertions, 10 deletions

diff --git a/TAO/tests/Faults/test_i.cpp b/TAO/tests/Faults/test_i.cpp
index bdb07cfb63d..aae860a4fb4 100644
--- a/TAO/tests/Faults/test_i.cpp
+++ b/TAO/tests/Faults/test_i.cpp
@@ -13,13 +13,7 @@ Callback_i::shutdown (CORBA::Boolean is_clean)
     {
       ACE_DEBUG ((LM_DEBUG, "Performing catastrophic shutdown\n"));
 
-// OpenVMS seems to hang and not abort and dump core when abort() is called
-// here. This needs further investigation.
-#if defined (ACE_OPENVMS)
-      ACE_OS::_exit();
-#else
       ACE_OS::abort();
-#endif
       return;
     }
   this->orb_->shutdown (false);
@@ -51,11 +45,7 @@ Simple_Server_i::shutdown_now (CORBA::Boolean is_clean)
   if (is_clean == 0)
     {
       ACE_DEBUG ((LM_DEBUG, "Performing catastrophic shutdown\n"));
-#if defined (ACE_OPENVMS)
-      ACE_OS::_exit();
-#else
       ACE_OS::abort();
-#endif
       return;
     }