Mon Oct 25 14:07:15 UTC 2010 Phil Mesnier <mesnier_p@ociweb.com>

        * ace/Service_Gestalt.cpp:         
          Another fix to error processing behavior. If the result of
          process_directives() was > 0, that value was replaced by the
          result of process_commandline_directives(), which is contrary to
          the expected behavior. Now the result is the sum of these to
          return values, unless either returns -1, then the result is just
          -1.

1 files changed, 6 insertions, 1 deletions

diff --git a/ACE/ace/Service_Gestalt.cpp b/ACE/ace/Service_Gestalt.cpp
index 9723e91504d..bd80fefc177 100644
--- a/ACE/ace/Service_Gestalt.cpp
+++ b/ACE/ace/Service_Gestalt.cpp
@@ -1112,7 +1112,12 @@ ACE_Service_Gestalt::open_i (const ACE_TCHAR program_name[],
     {
       result = this->process_directives ();
       if (result != -1)
-        result = this->process_commandline_directives ();
+        {
+          int temp = this->process_commandline_directives ();
+          if (temp == -1)
+            result = -1;
+          else result += temp;
+        }
     }
 
   // Reset debugging back to the way it was when we came into