summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2006-10-26 12:54:55 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2006-10-26 12:54:55 +0000
commitc69c25a4cdafb85cc6badfc48f792748e4b0822d (patch)
tree1ba096f3ee5915ac6b3626f90115c82547dd6db4
parentc58d2c33e6ba13cdcf9e0a210770ff7fa236fe85 (diff)
downloadATCD-c69c25a4cdafb85cc6badfc48f792748e4b0822d.tar.gz
Thu Oct 26 12:54:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl>
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.cpp4
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp6
2 files changed, 5 insertions, 5 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.cpp
index 6a6492dd90c..7ab74bdf599 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.cpp
@@ -257,7 +257,7 @@ TAO_ECG_CDR_Message_Sender::send_fragment (const ACE_INET_Addr &addr,
expected_n += iov[i].iov_len;
if (n > 0 && size_t(n) != expected_n)
{
- ACE_DEBUG ((LM_ERROR, ("Sent only %d out of %d bytes "
+ ACE_ERROR ((LM_ERROR, ("Sent only %d out of %d bytes "
"for mcast fragment.\n"),
n,
expected_n));
@@ -267,7 +267,7 @@ TAO_ECG_CDR_Message_Sender::send_fragment (const ACE_INET_Addr &addr,
{
if (errno == EWOULDBLOCK)
{
- ACE_DEBUG ((LM_ERROR, "Send of mcast fragment failed (%m).\n"));
+ ACE_ERROR ((LM_ERROR, "Send of mcast fragment failed (%m).\n"));
// @@ TODO Use a Event Channel specific exception
ACE_THROW (CORBA::COMM_FAILURE ());
}
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp
index ed3acdc46f9..9c4851c70c1 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp
@@ -105,7 +105,7 @@ TAO_ECG_Mcast_EH::shutdown (void)
this->receiver_ = 0;
// Deregister from reactor, close and clean up sockets.
- size_t subscriptions_size = this->subscriptions_.size ();
+ size_t const subscriptions_size = this->subscriptions_.size ();
for (size_t i = 0; i != subscriptions_size; ++i)
{
(void) this->reactor ()->remove_handler (
@@ -122,7 +122,7 @@ TAO_ECG_Mcast_EH::shutdown (void)
int
TAO_ECG_Mcast_EH::handle_input (ACE_HANDLE fd)
{
- size_t subscriptions_size = this->subscriptions_.size ();
+ size_t const subscriptions_size = this->subscriptions_.size ();
for (size_t i = 0; i != subscriptions_size; ++i)
{
ACE_SOCK_Dgram_Mcast *socket = this->subscriptions_[i].dgram;
@@ -225,7 +225,7 @@ TAO_ECG_Mcast_EH::add_new_subscriptions (Address_Set& multicast_addresses)
new_subscription.mcast_addr = *k;
ACE_NEW (new_subscription.dgram, ACE_SOCK_Dgram_Mcast);
- size_t subscriptions_size = this->subscriptions_.size ();
+ size_t const subscriptions_size = this->subscriptions_.size ();
this->subscriptions_.size (subscriptions_size + 1);
this->subscriptions_[subscriptions_size] = new_subscription;