ChangeLogTag:Tue Jun 12 15:06:06 2001 Krishnakumar B <kitty@cs.wustl.edu>

2 files changed, 31 insertions, 32 deletions

diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index 629816fa726..47f1f29cd84 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,26 +1,30 @@
+Tue Jun 12 18:21:06 2001  Douglas C. Schmidt  <schmidt@tango.doc.wustl.edu>
+
+	* tao/TAO_Internal.cpp (open_services): Added a missing call to
+	  len = svc_config_argv.length ().
+
 Tue Jun 12 18:16:52 2001  Jeff Parsons <parsons@cs.wustl.edu>
 
         * docs/releasenotes/index.html:
 
-          Moved section on the interface repository to the new
-          document listed below. Also added link to the new
-          dynamic any documentation listed below.
+          Moved section on the interface repository to the new document
+ 	  listed below. Also added link to the new dynamic any
+ 	  documentation listed below.
 
         * docs/dynany/index.html:
 
-          New file - documemtation for TAO's dynamic any
-          implementation.
+          New file - documemtation for TAO's dynamic any implementation.
 
         * docs/interfacerepo/index.html:
 
-          New file - contains documentation for TAO's interface
-          repository implementation that was previously in the
-          main releasenotes file.
+          New file - contains documentation for TAO's interface repository
+ 	  implementation that was previously in the main releasenotes
+ 	  file.
 
         * docs/interfacerepo/tao_ifr.html:
 
           New file - user's guide to tao_ifr, the TAO interface repository
-          loader, including a table of the command line options.
+ 	  loader, including a table of the command line options.
 
 Tue Jun 12 18:12:13 2001  Jeff Parsons <parsons@cs.wustl.edu>
 
@@ -35,8 +39,7 @@ Tue Jun 12 18:12:13 2001  Jeff Parsons <parsons@cs.wustl.edu>
         * tests/DynAny_Test/test_dynunion.cpp:
 
           Corrected and expanded these tests to correspond with the
-          changes to TAO's dynamic any implementation in the entry
-          below.
+ 	  changes to TAO's dynamic any implementation in the entry below.
 
 Tue Jun 12 17:53:45 2001  Jeff Parsons <parsons@cs.wustl.edu>
 
@@ -59,27 +62,25 @@ Tue Jun 12 17:53:45 2001  Jeff Parsons <parsons@cs.wustl.edu>
         * tao/DynamicAny/TAO_DynamicAny.dsp:
         * tao/DynamicAny/TAO_DynamicAny_Static.dsp:
 
-          Modified the implementation to conform to CORBA
-          2.4.2, and especially with the major changes
-          that appeared in CORBA 2.3.1.
+          Modified the implementation to conform to CORBA 2.4.2, and
+ 	  especially with the major changes that appeared in CORBA 2.3.1.
 
         * tao/DynamicAny/DynCommon.cpp:
         * tao/DynamicAny/DynCommon.h:
 
-          New files containing an abstract base class that
-          holds implementations for all the insert_* and
-          get_* methods, as well as some of the other
-          methods common to all the dynamic any classes and
-          some utility functions. All the TAO dynamic any
-          implementation classes inherit from this as well
-          as from the corresponding generated class.
+          New files containing an abstract base class that holds
+ 	  implementations for all the insert_* and get_* methods, as well
+ 	  as some of the other methods common to all the dynamic any
+ 	  classes and some utility functions. All the TAO dynamic any
+ 	  implementation classes inherit from this as well as from the
+ 	  corresponding generated class.
 
         * tao/DynamicAny/DynUnion_i_T.cpp:
         * tao/DynamicAny/DynUnion_i_T.h:
 
-          Removed these files. There is now an alternate
-          implementation in DynUnion_i.* that was previously
-          handled by template classes in these files.
+          Removed these files. There is now an alternate implementation in
+ 	  DynUnion_i.* that was previously handled by template classes in
+ 	  these files.
 
 Tue Jun 12 17:46:16 2001  Jeff Parsons <parsons@cs.wustl.edu>
 
@@ -87,12 +88,11 @@ Tue Jun 12 17:46:16 2001  Jeff Parsons <parsons@cs.wustl.edu>
         * orbsvcs/orbsvcs/CosNotifyComm.idl:
         * orbsvcs/orbsvcs/CosNotifyFilter.idl:
 
-          Moved the preprocessor macro #pragma prefix "omg.org"
-          to come after the includes of other IDL files, so it
-          wouldn't be nullified by the #pragma prefix "" that
-          comes at the end of each IDL file. Thanks to
-          Rob Andzik <andzik@rtlogic.com> for reporting the
-          fact that the generated repo ids were incorrect.
+          Moved the preprocessor macro #pragma prefix "omg.org" to come
+ 	  after the includes of other IDL files, so it wouldn't be
+ 	  nullified by the #pragma prefix "" that comes at the end of each
+ 	  IDL file. Thanks to Rob Andzik <andzik@rtlogic.com> for
+ 	  reporting the fact that the generated repo ids were incorrect.
 
 Tue Jun 12 17:42:59 2001  Jeff Parsons <parsons@cs.wustl.edu>
 
diff --git a/TAO/tao/TAO_Internal.cpp b/TAO/tao/TAO_Internal.cpp
index 7bcb192c2a1..93096ed99be 100644
--- a/TAO/tao/TAO_Internal.cpp
+++ b/TAO/tao/TAO_Internal.cpp
@@ -38,8 +38,6 @@ const char *TAO_Internal::server_strategy_args_ = 0;
 const char *TAO_Internal::client_strategy_args_ = 0;
 #endif /* TAO_PLATFORM_SVC_CONF_FILE_NOTSUP */
 
-
-
 int
 TAO_Internal::open_services (int &argc, char **argv)
 {
@@ -136,6 +134,7 @@ TAO_Internal::open_services (int &argc, char **argv)
         }
       else if ((current_arg = arg_shifter.get_the_parameter ("-ORBServiceConfigLoggerKey")))
         {
+          len = svc_config_argv.length ();
           svc_config_argv.length (len + 2);  // 2 arguments to add
 
           svc_config_argv[len] = CORBA::string_dup ("-k");