Mon Aug 11 09:02:15 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl>

1 files changed, 16 insertions, 16 deletions

diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp
index c68688c480b..c05b97b6cc5 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp
@@ -23,7 +23,7 @@ TAO_EC_ProxyPushConsumer::
     TAO_EC_ProxyPushConsumer (TAO_EC_Event_Channel_Base* ec)
   : event_channel_ (ec),
     refcount_ (1),
-    connected_ (0),
+    connected_ (false),
     filter_ (0)
 {
   this->lock_ =
@@ -32,7 +32,7 @@ TAO_EC_ProxyPushConsumer::
   this->default_POA_ =
     this->event_channel_->consumer_poa ();
 
-  this->qos_.is_gateway = 0;
+  this->qos_.is_gateway = false;
 }
 
 TAO_EC_ProxyPushConsumer::~TAO_EC_ProxyPushConsumer (void)
@@ -53,14 +53,14 @@ TAO_EC_ProxyPushConsumer::supplier_non_existent (
         CORBA::INTERNAL ());
 
     disconnected = 0;
-    if (this->is_connected_i () == 0)
+    if (!this->is_connected_i ())
       {
-        disconnected = 1;
-        return 0;
+        disconnected = true;
+        return false;
       }
     if (CORBA::is_nil (this->supplier_.in ()))
       {
-        return 0;
+        return false;
       }
     supplier = CORBA::Object::_duplicate (this->supplier_.in ());
   }
@@ -142,7 +142,7 @@ TAO_EC_ProxyPushConsumer::shutdown (void)
         RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
 
     supplier = this->supplier_._retn ();
-    this->connected_ = 0;
+    this->connected_ = false;
 
     this->shutdown_hook ();
 
@@ -175,7 +175,7 @@ TAO_EC_ProxyPushConsumer::cleanup_i (void)
 {
   this->supplier_ =
     RtecEventComm::PushSupplier::_nil ();
-  this->connected_ = 0;
+  this->connected_ = false;
 
   if (this->filter_ != 0)
     {
@@ -243,7 +243,7 @@ TAO_EC_ProxyPushConsumer_Guard::
      refcount_ (refcount),
      event_channel_ (ec),
      proxy_ (proxy),
-     locked_ (0)
+     locked_ (false)
 {
   ACE_Guard<ACE_Lock> ace_mon (*this->lock_);
   // If the guard fails there is not much we can do, raising an
@@ -253,14 +253,14 @@ TAO_EC_ProxyPushConsumer_Guard::
   // @@ Returning something won't work either, the error should be
   // logged though!
 
-  if (proxy->is_connected_i () == 0)
-    return;
-
-  this->filter = this->proxy_->filter_i ();
-  this->filter->_incr_refcnt ();
+  if (proxy->is_connected_i ())
+    {
+      this->filter = this->proxy_->filter_i ();
+      this->filter->_incr_refcnt ();
 
-  this->locked_ = 1;
-  this->refcount_++;
+      this->locked_ = true;
+      ++this->refcount_;
+    }
 }
 
 TAO_EC_ProxyPushConsumer_Guard::