ChangeLogTag: Sun Apr 6 00:03:27 UTC 2008 Iliyan Jeliazkov <iliyan@ociweb.com>

1 files changed, 8 insertions, 25 deletions

diff --git a/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/server.cpp b/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/server.cpp
index a66dad23b81..baca150ccfd 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/server.cpp
@@ -148,8 +148,6 @@ ACE_TMAIN(int, ACE_TCHAR ** argv)
 {
   int result = 0;
 
-  ACE_Service_Config serviceConfig;
-
   char signum[64];
   ACE_OS::sprintf(signum, "%d", SIGUSR1);
 
@@ -158,13 +156,14 @@ ACE_TMAIN(int, ACE_TCHAR ** argv)
   args.add("-s");
   args.add(signum);
 
-  result = serviceConfig.open (
-    args.argc(),
+  ACE_Service_Config &serviceConfig = *ACE_Service_Config::singleton ();
+
+  result = serviceConfig.open (args.argc(),
     args.argv(),
     ACE_DEFAULT_LOGGER_KEY,
-    1, // ignore_static_svcs = 1,
-    1, // ignore_default_svc_conf_file = 0,
-    0  // ignore_debug_flag = 0
+                               true, // ignore_static_svcs = 1,
+                               true, // ignore_default_svc_conf_file = 0,
+                               false  // ignore_debug_flag = 0
   );
 
   if(0 != result)
@@ -174,6 +173,8 @@ ACE_TMAIN(int, ACE_TCHAR ** argv)
   }
   ACE_DEBUG ((LM_INFO, ACE_TEXT ("serviceConfig.open done\n")));
 
+
+
   for(int i = 0; i < 5; ++i)
   {
     ACE_DEBUG ((LM_INFO, ACE_TEXT ("loadOrb ...\n")));
@@ -215,23 +216,5 @@ ACE_TMAIN(int, ACE_TCHAR ** argv)
     ACE_DEBUG ((LM_INFO, ACE_TEXT ("unloadOrb done\n")));
   }
 
-  ACE_DEBUG ((LM_INFO, ACE_TEXT ("serviceConfig.fini_svcs ...\n")));
-  result = serviceConfig.fini_svcs();
-  if(0 != result)
-  {
-    ACE_DEBUG ((LM_ERROR, ACE_TEXT ("serviceConfig.fini_svcs failed\n")));
-    return result;
-  }
-  ACE_DEBUG ((LM_INFO, ACE_TEXT ("serviceConfig.fini_svcs done\n")));
-
-  ACE_DEBUG ((LM_INFO, ACE_TEXT ("serviceConfig.close ...\n")));
-  result = serviceConfig.close();
-  if(0 != result)
-  {
-    ACE_DEBUG ((LM_ERROR, ACE_TEXT ("serviceConfig.close failed\n")));
-    return result;
-  }
-  ACE_DEBUG ((LM_INFO, ACE_TEXT ("serviceConfig.close done\n")));
-
   return 0;
 }