ChangeLogTag: Thu Aug 18 13:46:38 2005 J.T. Conklin <jtc@acorntoolworks.com>

7 files changed, 26 insertions, 7 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index d87cbea25d6..f4da629f8a2 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,9 +1,28 @@
+Thu Aug 18 13:46:38 2005  J.T. Conklin  <jtc@acorntoolworks.com>
+
+	* orbsvcs/orbsvcs/Log/LogActivator.cpp:
+
+	  Changed to omit identifier name for unused parameters.
+
+	* orbsvcs/orbsvcs/Log/LogMgr_i.cpp:
+
+	  Changed to use CORBA::RepositoryId_var for the return value of
+	  create_log_repositoryid() so results will be freed on exit.
+
+	* orbsvcs/orbsvcs/Log/BasicLogFactory_i.cpp:
+	* orbsvcs/orbsvcs/Log/EventLogFactory_i.cpp:
+	* orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp:
+	* orbsvcs/orbsvcs/Log/RTEventLogFactory_i.cpp:
+
+	  Changed create_log_repositoryid() to duplicate string rather
+	  than returning a string literal.
+
 Thu Aug 18 15:19:40 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
 
         * TAO_IDL/be/be_visitor_exception/exception_ctor.cpp:
         * TAO_IDL/be/be_visitor_union_branch/private_ch.cpp:
         * TAO_IDL/be/be_visitor_union_branch/public_ch.cpp:
-        
+
           Removed more instances of generating a leading '::'
           in front of ACE_NESTED_CLASS.
 
diff --git a/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.cpp b/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.cpp
index 72129689b74..977e11d580b 100644
--- a/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.cpp
@@ -118,7 +118,7 @@ TAO_BasicLogFactory_i::create_with_id (DsLogAdmin::LogId id,
 CORBA::RepositoryId
 TAO_BasicLogFactory_i::create_repositoryid ()
 {
-  return "IDL:omg.org/DsLogAdmin:BasicLog:1.0";
+  return CORBA::string_dup("IDL:omg.org/DsLogAdmin:BasicLog:1.0");
 }
 
 PortableServer::ServantBase*
diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.cpp b/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.cpp
index 4b66aec19a5..500416bd39d 100644
--- a/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.cpp
@@ -200,7 +200,7 @@ TAO_EventLogFactory_i::create_with_id (
 CORBA::RepositoryId
 TAO_EventLogFactory_i::create_repositoryid ()
 {
-  return "IDL:omg.org/DsEventLogAdmin:EventLog:1.0";
+  return CORBA::string_dup("IDL:omg.org/DsEventLogAdmin:EventLog:1.0");
 }
 
 PortableServer::ServantBase*
diff --git a/TAO/orbsvcs/orbsvcs/Log/LogActivator.cpp b/TAO/orbsvcs/orbsvcs/Log/LogActivator.cpp
index ffd11ea0047..303ee6d7d3c 100644
--- a/TAO/orbsvcs/orbsvcs/Log/LogActivator.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/LogActivator.cpp
@@ -18,7 +18,7 @@ TAO_LogActivator::~TAO_LogActivator ()
 
 PortableServer::Servant
 TAO_LogActivator::incarnate (const PortableServer::ObjectId& oid,
-			     PortableServer::POA_ptr poa
+			     PortableServer::POA_ptr
 			     ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
 		   PortableServer::ForwardRequest
diff --git a/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.cpp b/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.cpp
index c2a0e5f32d3..c910dc31635 100644
--- a/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.cpp
@@ -130,7 +130,7 @@ TAO_LogMgr_i::create_log_reference (DsLogAdmin::LogId id
 {
   PortableServer::ObjectId_var oid =
     this->create_objectid (id);
-  const char *intf =
+  CORBA::RepositoryId_var intf = 
     this->create_repositoryid ();
 
   CORBA::Object_var obj =
diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp b/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp
index e84313d8936..a0156b4153b 100644
--- a/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp
@@ -187,7 +187,7 @@ TAO_NotifyLogFactory_i::create_with_id (
 CORBA::RepositoryId
 TAO_NotifyLogFactory_i::create_repositoryid ()
 {
-  return "IDL:omg.org/DsNotifyLogAdmin:NotifyLog:1.0";
+  return CORBA::string_dup("IDL:omg.org/DsNotifyLogAdmin:NotifyLog:1.0");
 }
 
 PortableServer::ServantBase*
diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.cpp b/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.cpp
index be97577084c..8cad93598aa 100644
--- a/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.cpp
@@ -196,7 +196,7 @@ TAO_RTEventLogFactory_i::create_with_id (
 CORBA::RepositoryId
 TAO_RTEventLogFactory_i::create_repositoryid ()
 {
-  return "IDL:omg.org/RTEventLogAdmin:EventLog:1.0";
+  return CORBA::string_dup("IDL:omg.org/RTEventLogAdmin:EventLog:1.0");
 }
 
 PortableServer::ServantBase*