1 files changed, 0 insertions, 34 deletions
diff --git a/TAO/orbsvcs/Naming_Service/Naming_Server.cpp b/TAO/orbsvcs/Naming_Service/Naming_Server.cpp
index 9dd785b891e..a16d6d434dc 100644
--- a/TAO/orbsvcs/Naming_Service/Naming_Server.cpp
+++ b/TAO/orbsvcs/Naming_Service/Naming_Server.cpp
@@ -3,34 +3,6 @@
 #include "Naming_Service.h"
 #include "ace/OS_main.h"
 
-#include <orbsvcs/Shutdown_Utilities.h>
-#include <tao/debug.h>
-
-class Naming_Svc_Shutdown : public Shutdown_Functor
-{
-public:
-  Naming_Svc_Shutdown(TAO_Naming_Service& ns);
-
-  void operator() (int which_signal);
-private:
-  TAO_Naming_Service& ns_;
-};
-
-Naming_Svc_Shutdown::Naming_Svc_Shutdown (TAO_Naming_Service &ns)
-  : ns_(ns)
-{
-}
-
-void
-Naming_Svc_Shutdown::operator() (int which_signal)
-{
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG,
-                "Name Service: shutting down on signal %d\n",
-                which_signal));
-  (void) this->ns_.shutdown ();
-}
-
 // Driver function for the TAO Naming Service.
 
 int
@@ -38,10 +10,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   TAO_Naming_Service naming_service;
 
-  // Stuff to insure that we're gracefully shut down...
-  Naming_Svc_Shutdown killer (naming_service);
-  Service_Shutdown kill_contractor(killer);
-
   if (naming_service.init (argc, argv) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
                        ACE_LIB_TEXT("Failed to start the Naming Service.\n")),
@@ -61,7 +29,5 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
   ACE_ENDTRY;
   ACE_CHECK_RETURN (1);
 
-  naming_service.fini ();
-
   return 0;
 }