Changed the default value of <ignore_static_svcs> to 1.

Added an extra argument <ignore_static_svcs> to both open method.

3 files changed, 15 insertions, 6 deletions

diff --git a/ace/Service_Config.cpp b/ace/Service_Config.cpp
index 78637656ef0..8eb36024b3e 100644
--- a/ace/Service_Config.cpp
+++ b/ace/Service_Config.cpp
@@ -522,11 +522,14 @@ ACE_Service_Config::load_static_svcs (void)
 
 int
 ACE_Service_Config::open (const ASYS_TCHAR program_name[],
-                          LPCTSTR logger_key)
+                          LPCTSTR logger_key,
+                          int ignore_static_svcs)
 {
   int retval = 0;
   ACE_TRACE ("ACE_Service_Config::open");
 
+  ACE_Service_Config::no_static_svcs_ = (char) ignore_static_svcs;
+
   if (ACE_Service_Config::init_svc_conf_file_queue () == -1)
     return -1;
 
diff --git a/ace/Service_Config.h b/ace/Service_Config.h
index b9238c199ee..1c4416a215b 100644
--- a/ace/Service_Config.h
+++ b/ace/Service_Config.h
@@ -102,7 +102,7 @@ public:
 
   // = Initialization and termination methods.
 
-  ACE_Service_Config (int ignore_static_svcs = 0,
+  ACE_Service_Config (int ignore_static_svcs = 1,
                       size_t size = ACE_Service_Config::MAX_SERVICES,
                       int signum = SIGHUP);
   // Initialize the Service Repository.
@@ -112,13 +112,15 @@ public:
   // Performs an open without parsing command-line arguments.
 
   static int open (const ASYS_TCHAR program_name[],
-                   LPCTSTR logger_key = ACE_DEFAULT_LOGGER_KEY);
+                   LPCTSTR logger_key = ACE_DEFAULT_LOGGER_KEY,
+                   int ignore_static_svcs = 1);
   // Performs an open without parsing command-line arguments.  Returns
   // number of errors that occurred on failure and 0 otherwise.
 
   static int open (int argc,
                    ASYS_TCHAR *argv[],
-                   LPCTSTR logger_key = ACE_DEFAULT_LOGGER_KEY);
+                   LPCTSTR logger_key = ACE_DEFAULT_LOGGER_KEY,
+                   int ignore_static_svcs = 1);
   // This is the primary entry point into the ACE_Service_Config (the
   // constructor just handles simple initializations).  It parses
   // arguments passed in from the command-line.  Returns number of
diff --git a/ace/Service_Config.i b/ace/Service_Config.i
index a5cc47b8b85..fe914273535 100644
--- a/ace/Service_Config.i
+++ b/ace/Service_Config.i
@@ -8,10 +8,14 @@
 
 ACE_INLINE int
 ACE_Service_Config::open (int argc,
-                          ASYS_TCHAR *argv[], 
-                          LPCTSTR logger_key)
+                          ASYS_TCHAR *argv[],
+                          LPCTSTR logger_key,
+                          int ingore_static_svcs)
 {
   ACE_TRACE ("ACE_Service_Config::open");
+
+  ACE_Service_Config::no_static_svcs_ = (char) ignore_static_svcs;
+
   if (ACE_Service_Config::parse_args (argc, argv) == -1)
     return -1;
   else