ChangeLogTag: Tue Dec 21 12:37:42 2004 Chad Elliott <elliott_c@ociweb.com>

8 files changed, 27 insertions, 9 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index bbc8a311d01..cf9b238b81c 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,21 @@
+Tue Dec 21 12:37:42 2004  Chad Elliott  <elliott_c@ociweb.com>
+
+        * orbsvcs/ImplRepo_Service/Activator_Options.h:
+        * orbsvcs/ImplRepo_Service/Activator_Options.cpp:
+        * orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp:
+        * orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp:
+        * orbsvcs/ImplRepo_Service/Locator_Options.h:
+        * orbsvcs/ImplRepo_Service/Locator_Options.cpp:
+
+          Due to some peculiarity of gcc 2.95.3, I have changed the cmdline
+          methods to return const char* instead of const ACE_CString&.  This
+          alleviates a core dump.
+
+        * orbsvcs/examples/ImR/Combined_Service/start_all.conf:
+
+          Start the locator on localhost only as that is all that is
+          necessary.
+
 Tue Dec 21 09:49:50 2004  Chad Elliott  <elliott_c@ociweb.com>
 
         * orbsvcs/orbsvcs/Notify/EventTypeSeq.cpp:
diff --git a/TAO/orbsvcs/ImplRepo_Service/Activator_Options.cpp b/TAO/orbsvcs/ImplRepo_Service/Activator_Options.cpp
index 427982545fa..97c828255af 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Activator_Options.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Activator_Options.cpp
@@ -275,7 +275,7 @@ Options::service_command(void) const
   return this->service_command_;
 }
 
-const ACE_CString&
+const char*
 Options::cmdline(void) const {
-  return this->cmdline_;
+  return this->cmdline_.c_str ();
 }
diff --git a/TAO/orbsvcs/ImplRepo_Service/Activator_Options.h b/TAO/orbsvcs/ImplRepo_Service/Activator_Options.h
index 7ae6ef97d30..fdf4d58acb9 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Activator_Options.h
+++ b/TAO/orbsvcs/ImplRepo_Service/Activator_Options.h
@@ -62,7 +62,7 @@ public:
   /// Save the command line arguments as registry settings. (Windows only)
   int save_registry_options ();
 
-  const ACE_CString& cmdline(void) const;
+  const char* cmdline(void) const;
 
 private:
   /// Parses and pulls out arguments for the ImR
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp
index c5d7de47c60..0ca0a575b4f 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp
@@ -145,7 +145,7 @@ ImR_Activator_i::init_with_orb(CORBA::ORB_ptr orb, const Options& opts ACE_ENV_A
 int
 ImR_Activator_i::init (Options& opts ACE_ENV_ARG_DECL)
 {
-  ACE_ARGV av(opts.cmdline().c_str());
+  ACE_ARGV av(opts.cmdline());
   int argc = av.argc();
 
   CORBA::ORB_var orb =
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp
index 6602e7a0a88..1a59d3efab3 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp
@@ -160,7 +160,7 @@ ImR_Locator_i::init_with_orb (CORBA::ORB_ptr orb, Options& opts ACE_ENV_ARG_DECL
 int
 ImR_Locator_i::init(Options& opts ACE_ENV_ARG_DECL)
 {
-  ACE_ARGV av(opts.cmdline().c_str());
+  ACE_ARGV av(opts.cmdline());
   int argc = av.argc();
   char** argv = av.argv();
 
diff --git a/TAO/orbsvcs/ImplRepo_Service/Locator_Options.cpp b/TAO/orbsvcs/ImplRepo_Service/Locator_Options.cpp
index b4bc4f374dd..70e960a31b7 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Locator_Options.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Locator_Options.cpp
@@ -445,9 +445,9 @@ Options::service_command(void) const
   return this->service_command_;
 }
 
-const ACE_CString&
+const char*
 Options::cmdline(void) const {
-  return this->cmdline_;
+  return this->cmdline_.c_str ();
 }
 
 const ACE_CString&
diff --git a/TAO/orbsvcs/ImplRepo_Service/Locator_Options.h b/TAO/orbsvcs/ImplRepo_Service/Locator_Options.h
index 64b9f644240..682b2769523 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Locator_Options.h
+++ b/TAO/orbsvcs/ImplRepo_Service/Locator_Options.h
@@ -72,7 +72,7 @@ public:
 
   int save_registry_options();
 
-  const ACE_TString& cmdline(void) const;
+  const char* cmdline(void) const;
 
   /// File that contains the activator related information
   /// that the persistent locator has to save.
diff --git a/TAO/orbsvcs/examples/ImR/Combined_Service/start_all.conf b/TAO/orbsvcs/examples/ImR/Combined_Service/start_all.conf
index 0d08cc84a00..44f5e1e038d 100644
--- a/TAO/orbsvcs/examples/ImR/Combined_Service/start_all.conf
+++ b/TAO/orbsvcs/examples/ImR/Combined_Service/start_all.conf
@@ -1,2 +1,2 @@
-dynamic ImR_Locator_Loader Service_Object * TAO_ImR_Locator:_make_ImR_Locator_Loader() '-orbcollocation per-orb -orbobjrefstyle url -d 1 -orbendpoint iiop://:9999'
+dynamic ImR_Locator_Loader Service_Object * TAO_ImR_Locator:_make_ImR_Locator_Loader() '-orbcollocation per-orb -orbobjrefstyle url -d 1 -orbendpoint iiop://localhost:9999'
 dynamic ImR_Activator_Loader Service_Object * TAO_ImR_Activator:_make_ImR_Activator_Loader() '-orbcollocation per-orb -d 1 -orbinitref ImplRepoService=corbaloc::localhost:9999/ImplRepoService'