diff options
| author | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2008-05-23 11:45:38 +0000 |
|---|---|---|
| committer | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2008-05-23 11:45:38 +0000 |
| commit | 142698ad8a68d972148fb87ae6afd6935b5c1cab (patch) | |
| tree | 9a96d068da579bd04684ecba6bf1892922067348 | |
| parent | 01562099f765c486fb9e702645d14def2bf8dc0f (diff) | |
| download | ATCD-142698ad8a68d972148fb87ae6afd6935b5c1cab.tar.gz | |
ChangeLogTag: Fri May 23 11:42:38 UTC 2008 Jeff Parsons <j.parsons@vanderbilt.edu>
| -rw-r--r-- | TAO/ChangeLog | 7 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorEventChannel.cpp | 50 |
2 files changed, 31 insertions, 26 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 9f4084921b2..3f5531214c6 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,10 @@ +Fri May 23 11:42:38 UTC 2008 Jeff Parsons <j.parsons@vanderbilt.edu> + + * orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorEventChannel.cpp (add_stats): + + Removed an unused local variable, thanks again to Simon Massey + <simon.massey@prismtech.com> for reporting the problem. + Fri May 23 11:30:15 UTC 2008 Jeff Parsons <j.parsons@vanderbilt.edu> * orbsvcs/orbsvcs/Notify/MonitorControl/Statistic.inl: diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorEventChannel.cpp b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorEventChannel.cpp index 7b0f28457e7..020482a171b 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorEventChannel.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorEventChannel.cpp @@ -504,9 +504,6 @@ TAO_MonitorEventChannel::add_stats (const char* name) if (this->name_.length () != 0) { - Monitor_Point_Registry* instance = - Monitor_Point_Registry::instance (); - ACE_CString dir_name (this->name_ + "/"); ACE_CString stat_name = dir_name + NotifyMonitoringExt::EventChannelCreationTime; @@ -573,10 +570,10 @@ TAO_MonitorEventChannel::add_stats (const char* name) EventChannelConsumersSuppliers* suppliers = 0; ACE_NEW_THROW_EX (suppliers, EventChannelConsumersSuppliers ( - this, - stat_name.c_str (), - TAO_Statistic::TS_NUMBER, - true), + this, + stat_name.c_str (), + TAO_Statistic::TS_NUMBER, + true), CORBA::NO_MEMORY ()); if (!this->register_statistic (stat_name, suppliers)) @@ -594,10 +591,10 @@ TAO_MonitorEventChannel::add_stats (const char* name) suppliers = 0; ACE_NEW_THROW_EX (suppliers, EventChannelConsumersSuppliers ( - this, - stat_name.c_str (), - TAO_Statistic::TS_LIST, - true), + this, + stat_name.c_str (), + TAO_Statistic::TS_LIST, + true), CORBA::NO_MEMORY ()); if (!this->register_statistic (stat_name, suppliers)) @@ -615,9 +612,9 @@ TAO_MonitorEventChannel::add_stats (const char* name) EventChannelConsumerSupplierAdmins* conadmins = 0; ACE_NEW_THROW_EX (conadmins, EventChannelConsumerSupplierAdmins ( - this, - stat_name.c_str (), - TAO_Statistic::TS_NUMBER), + this, + stat_name.c_str (), + TAO_Statistic::TS_NUMBER), CORBA::NO_MEMORY ()); if (!this->register_statistic (stat_name, conadmins)) @@ -635,9 +632,9 @@ TAO_MonitorEventChannel::add_stats (const char* name) conadmins = 0; ACE_NEW_THROW_EX (conadmins, EventChannelConsumerSupplierAdmins ( - this, - stat_name.c_str (), - TAO_Statistic::TS_LIST), + this, + stat_name.c_str (), + TAO_Statistic::TS_LIST), CORBA::NO_MEMORY ()); if (!this->register_statistic (stat_name, conadmins)) @@ -655,10 +652,10 @@ TAO_MonitorEventChannel::add_stats (const char* name) EventChannelConsumerSupplierAdmins* supadmins = 0; ACE_NEW_THROW_EX (supadmins, EventChannelConsumerSupplierAdmins ( - this, - stat_name.c_str (), - TAO_Statistic::TS_NUMBER, - true), + this, + stat_name.c_str (), + TAO_Statistic::TS_NUMBER, + true), CORBA::NO_MEMORY ()); if (!this->register_statistic (stat_name, supadmins)) @@ -676,10 +673,10 @@ TAO_MonitorEventChannel::add_stats (const char* name) supadmins = 0; ACE_NEW_THROW_EX (supadmins, EventChannelConsumerSupplierAdmins ( - this, - stat_name.c_str (), - TAO_Statistic::TS_LIST, - true), + this, + stat_name.c_str (), + TAO_Statistic::TS_LIST, + true), CORBA::NO_MEMORY ()); if (!this->register_statistic (stat_name, supadmins)) @@ -772,7 +769,8 @@ TAO_MonitorEventChannel::add_stats (const char* name) else { delete sd; - ACE_ERROR ((LM_ERROR, "Unable to add control: %s\n", + ACE_ERROR ((LM_ERROR, + "Unable to add control: %s\n", this->name_.c_str ())); } } |