ChangeLogTag: Thu Sep 29 15:07:30 2005 J.T. Conklin <jtc@acorntoolworks.com>

6 files changed, 27 insertions, 0 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 5c12e1648b7..a3574b1fae3 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,15 @@
+Thu Sep 29 15:07:30 2005  J.T. Conklin  <jtc@acorntoolworks.com>
+
+	* orbsvcs/orbsvcs/Log/EventLogFactory_i.cpp:
+	* orbsvcs/orbsvcs/Log/EventLog_i.cpp:
+	* orbsvcs/orbsvcs/Log/Log_i.cpp:
+	* orbsvcs/orbsvcs/Log/NotifyLog_i.cpp:
+	* orbsvcs/orbsvcs/Log/RTEventLog_i.cpp:
+
+	  De-fuzzed simple cases ACE_CHECK/ACE_TRY_CHECK warnings.
+	  I'll get to the remaining cases that need new temporary
+	  variables, etc. in the next week.
+
 Thu Sep 29 17:25:39 2005  Simon McQueen  <sm@prismtech.com>
 
         * orbsvcs/tests/Bug_2247_Regression/test_i.cpp:
diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.cpp b/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.cpp
index 500416bd39d..c6d7c41be56 100644
--- a/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.cpp
@@ -83,6 +83,7 @@ TAO_EventLogFactory_i::activate (CORBA::ORB_ptr orb,
 
 
   this->event_channel_ = init (this->poa_.in () ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (DsEventLogAdmin::EventLogFactory::_nil ());
 
   this->consumer_admin_ =
     this->event_channel_->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLog_i.cpp b/TAO/orbsvcs/orbsvcs/Log/EventLog_i.cpp
index 6cde003cf80..a7d8a257ff7 100644
--- a/TAO/orbsvcs/orbsvcs/Log/EventLog_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/EventLog_i.cpp
@@ -84,6 +84,7 @@ TAO_EventLog_i::destroy (ACE_ENV_SINGLE_ARG_DECL)
 {
   // Send event to indicate the log has been deleted.
   notifier_->object_deletion (logid_ ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
 
   // Remove ourselves from the list of logs.
   this->logmgr_i_.remove (this->logid_
diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp b/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp
index 08957b1152a..42abac1fe99 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp
@@ -1108,6 +1108,8 @@ TAO_Log_i::copy_attributes (DsLogAdmin::Log_ptr log
 
   const DsLogAdmin::AdministrativeState adminstrative_state =
     this->get_administrative_state (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK;
+
   log->set_administrative_state (adminstrative_state
                                  ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.cpp b/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.cpp
index fe0b4a44324..a515cac8e58 100644
--- a/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.cpp
@@ -54,7 +54,10 @@ TAO_NotifyLog_i::copy (DsLogAdmin::LogId &id ACE_ENV_ARG_DECL)
   ACE_CHECK_RETURN (DsLogAdmin::Log::_nil ());
 
   CosNotification::QoSProperties* qos = get_qos (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK_RETURN (DsLogAdmin::Log::_nil ());
+
   CosNotification::AdminProperties* admin = get_admin (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK_RETURN (DsLogAdmin::Log::_nil ());
 
   DsNotifyLogAdmin::NotifyLog_var log =
     notifyLogFactory->create (DsLogAdmin::halt, 0, thresholds_, static_cast<const CosNotification::QoSProperties> (*qos),
@@ -77,7 +80,10 @@ TAO_NotifyLog_i::copy_with_id (DsLogAdmin::LogId id ACE_ENV_ARG_DECL)
   ACE_CHECK_RETURN (DsLogAdmin::Log::_nil ());
 
   CosNotification::QoSProperties* qos = get_qos (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK_RETURN (DsLogAdmin::Log::_nil ());
+
   CosNotification::AdminProperties* admin = get_admin (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK_RETURN (DsLogAdmin::Log::_nil ());
 
   DsNotifyLogAdmin::NotifyLog_var log =
     notifyLogFactory->create_with_id (id, DsLogAdmin::halt, 0, thresholds_, static_cast<const CosNotification::QoSProperties> (*qos),
@@ -95,6 +101,7 @@ TAO_NotifyLog_i::destroy (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   notifier_->object_deletion (logid_ ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
 
   // Remove ourselves from the list of logs.
   this->logmgr_i_.remove (this->logid_
@@ -122,6 +129,8 @@ TAO_NotifyLog_i::activate (ACE_ENV_SINGLE_ARG_DECL)
 
   this->consumer_admin_ =
     this->event_channel_->new_for_consumers (ifgop, adminid ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+
   ACE_ASSERT (!CORBA::is_nil (consumer_admin_.in ()));
 
   CosNotifyFilter::FilterFactory_var ffact =
diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.cpp b/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.cpp
index 6da3c36c03a..2e1ecb377a2 100644
--- a/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.cpp
@@ -88,6 +88,7 @@ TAO_RTEventLog_i::destroy (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   notifier_->object_deletion (logid_ ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
 
   // Remove ourselves from the list of logs.
   this->logmgr_i_.remove (this->logid_
@@ -110,6 +111,7 @@ TAO_RTEventLog_i::activate (ACE_ENV_SINGLE_ARG_DECL)
 {
   RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
     this->event_channel_->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK;
 
   this->my_log_consumer_ = new TAO_Rtec_LogConsumer (this);
   this->my_log_consumer_->connect (consumer_admin.in ());