ChangeLogTag:Mon Mar 27 19:56:51 UTC 2006 Nanbor Wang <nanbor@exothermic.txcorp.com>

3 files changed, 19 insertions, 4 deletions

diff --git a/TAO/CIAO/DAnCE/NodeApplication/Configurator_Factory.cpp b/TAO/CIAO/DAnCE/NodeApplication/Configurator_Factory.cpp
index 0b54350047a..dd88e40e95e 100644
--- a/TAO/CIAO/DAnCE/NodeApplication/Configurator_Factory.cpp
+++ b/TAO/CIAO/DAnCE/NodeApplication/Configurator_Factory.cpp
@@ -8,7 +8,7 @@
 
 
 int
-CIAO::NodeApplication_Options::parse_args (int argc, char *argv[])
+CIAO::NodeApplication_Options::parse_args (int &argc, char *argv[])
 {
   //  ACE_Get_Opt get_opts (argc, argv, "nrk:o:");
   ACE_Arg_Shifter shifter (argc, argv);
@@ -26,9 +26,14 @@ CIAO::NodeApplication_Options::parse_args (int argc, char *argv[])
         this->rt_support_ = 1;
         shifter.consume_arg ();
       }
-    else if ((parm = shifter.get_the_parameter ("-o")) !=0)
+    else if (shifter.cur_arg_strncasecmp ("-o") == 0) 
       {
-        this->ior_output_filename_ = parm;
+        // This double checking is necessary to avoid the Arg_Shifter from
+        // mistaking any -ORBxxx flag as -o flag.
+        if ((parm = shifter.get_the_parameter ("-o")) !=0)
+          {
+            this->ior_output_filename_ = parm;
+          }
         shifter.consume_arg ();
       }
     else if ((parm = shifter.get_the_parameter ("-k")) !=0)
diff --git a/TAO/CIAO/DAnCE/NodeApplication/Configurator_Factory.h b/TAO/CIAO/DAnCE/NodeApplication/Configurator_Factory.h
index ed843d19247..e3302eb9182 100644
--- a/TAO/CIAO/DAnCE/NodeApplication/Configurator_Factory.h
+++ b/TAO/CIAO/DAnCE/NodeApplication/Configurator_Factory.h
@@ -56,7 +56,7 @@ namespace CIAO
     NodeApplication_Options () : use_callback_ (1), rt_support_ (0) {}
 
     // extracting commandline arguments
-    int parse_args (int argc, char *argv[]);
+    int parse_args (int &argc, char *argv[]);
 
     NodeApp_Configurator *create_nodeapp_configurator (void);
 
diff --git a/TAO/CIAO/DAnCE/NodeApplication/NodeApplication.cpp b/TAO/CIAO/DAnCE/NodeApplication/NodeApplication.cpp
index 4ceab08ebdb..ca8654f9317 100644
--- a/TAO/CIAO/DAnCE/NodeApplication/NodeApplication.cpp
+++ b/TAO/CIAO/DAnCE/NodeApplication/NodeApplication.cpp
@@ -1,5 +1,12 @@
 // $Id$
 #include "NodeApplication_Core.h"
+#include "ciao/CIAO_common.h"
+
+void print_arg (int argc, char *argv[])
+{
+  for (int i = 0; i < argc; ++i)
+    ACE_DEBUG ((LM_DEBUG, "NodeApplication ARGV[%d] = %s\n", i, argv [i]));
+}
 
 int
 main (int argc, char *argv[])
@@ -10,6 +17,9 @@ main (int argc, char *argv[])
 
       CIAO::NodeApplication_Options nodeapp_options;
 
+      if (CIAO::debug_level () > 9)
+        print_arg (argc, argv);
+
       if (nodeapp_options.parse_args (argc, argv) != 0)
         return -1;