1 files changed, 1 insertions, 11 deletions
diff --git a/TAO/tests/AMH_Exceptions/server.cpp b/TAO/tests/AMH_Exceptions/server.cpp
index 4bc543e5537..05d82934074 100644
--- a/TAO/tests/AMH_Exceptions/server.cpp
+++ b/TAO/tests/AMH_Exceptions/server.cpp
@@ -3,7 +3,6 @@
 
 #include "ace/OS_NS_stdio.h"
 #include "TestS.h"
-#include "tao/ORB_Core.h"
 
 /***************************/
 /*** Servant Declaration ***/
@@ -19,9 +18,6 @@ public:
                     ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void shutdown (Test::AMH_RoundtripResponseHandler_ptr _tao_rh ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException));
-
 protected:
   CORBA::ORB_ptr orb_;
 };
@@ -60,12 +56,6 @@ ST_AMH_Servant::test_method (Test::AMH_RoundtripResponseHandler_ptr _tao_rh,
   ACE_UNUSED_ARG (send_time);
 }
 
-void
-ST_AMH_Servant::shutdown (Test::AMH_RoundtripResponseHandler_ptr /*_tao_rh*/ ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
-}
 
 /*** Server Declaration ***/
 
@@ -202,7 +192,7 @@ ST_AMH_Server::run_event_loop ()
   ACE_TRY
     {
       ACE_Time_Value period (0, 11000);
-      while (!this->orb_->orb_core ()->has_shutdown ())
+      while (1)
         {
               this->orb_->perform_work (&period);
               ACE_TRY_CHECK;