Wed Jul 21 02:30:45 UTC 2010 Phil Mesnier <mesnier_p@ociweb.com>

        * ace/Service_Gestalt.h:
        * ace/Service_Gestalt.inl:
        * ace/Service_Gestalt.cpp:
        
          Add a specialized open method to be called by TAO. TAO depends
          on a modified order of directive evaluation.

1 files changed, 14 insertions, 4 deletions

diff --git a/ACE/ace/Service_Gestalt.cpp b/ACE/ace/Service_Gestalt.cpp
index be13aabe6a9..159b7c05d63 100644
--- a/ACE/ace/Service_Gestalt.cpp
+++ b/ACE/ace/Service_Gestalt.cpp
@@ -992,7 +992,8 @@ ACE_Service_Gestalt::open_i (const ACE_TCHAR program_name[],
                              const ACE_TCHAR* logger_key,
                              bool ignore_static_svcs,
                              bool ignore_default_svc_conf_file,
-                             bool ignore_debug_flag)
+                             bool ignore_debug_flag,
+			     bool for_TAO)
 {
   ACE_TRACE ("ACE_Service_Gestalt::open_i");
   int result = 0;
@@ -1083,10 +1084,19 @@ ACE_Service_Gestalt::open_i (const ACE_TCHAR program_name[],
     result = -1;
   else
     {
-      if (this->process_commandline_directives () == -1)
-        result = -1;
+      if (for_TAO)
+	{
+	  if (this->process_commandline_directives () == -1)
+	    result = -1;
+	  else
+	    result = this->process_directives ();
+	}
       else
-        result = this->process_directives ();
+	{
+	  result = this->process_directives ();
+	  if (result != -1 || errno == ENOENT)
+	    result = this->process_commandline_directives ();
+	}
     }