diff options
| author | Abdullah Sowayan <sowayan@users.noreply.github.com> | 2007-07-14 14:56:10 +0000 |
|---|---|---|
| committer | Abdullah Sowayan <sowayan@users.noreply.github.com> | 2007-07-14 14:56:10 +0000 |
| commit | c753f6d21cad45e868eabee4a8f89f5af3cad0f7 (patch) | |
| tree | 7b0131de609a1a113fa448a7d5ece7c41fbafeef /TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel | |
| parent | 5b936b3e53e65fc21566438904c227232ef75417 (diff) | |
| download | ATCD-c753f6d21cad45e868eabee4a8f89f5af3cad0f7.tar.gz | |
Sat Jul 14 14:43:31 UTC 2007 Abdullah Sowayan <abdullah.sowayan@lmco.com>
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel')
3 files changed, 13 insertions, 13 deletions
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ConnectionHandler_T.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ConnectionHandler_T.h index 37a7597914d..116a7cdbe70 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ConnectionHandler_T.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ConnectionHandler_T.h @@ -50,7 +50,7 @@ template <ACE_PEER_STREAM_1> class ConnectionDetectHandler : public ACE_Svc_Handler <ACE_PEER_STREAM_2, ACE_NULL_SYNCH> { public: - ConnectionDetectHandler(TAO_FTEC_Fault_Listener* listener = NULL) + ConnectionDetectHandler(TAO_FTEC_Fault_Listener* listener = 0) : listener_(listener){} virtual int close (u_long flags = 0); diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.cpp index e3a38dcd463..421709b9748 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.cpp @@ -25,7 +25,7 @@ TAO_FTEC_Event_Channel::TAO_FTEC_Event_Channel(CORBA::ORB_var orb, PortableServer::POA_var poa) : orb_(orb) , poa_(poa) - , ec_impl_(NULL) + , ec_impl_(0) { } diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp index 0a871bebfdf..d44c64cf91d 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp @@ -63,7 +63,7 @@ void connect_push_supplier(TAO_FTEC_Event_Channel_Impl* ec, TAO_FTEC_ProxyPushConsumer* proxy = ec->find_proxy_push_consumer(op.object_id); - if (proxy == NULL) { + if (proxy == 0) { obtain_push_consumer_and_connect(ec, op.object_id, param.push_supplier.in(), @@ -105,7 +105,7 @@ void connect_push_consumer(TAO_FTEC_Event_Channel_Impl* ec, TAO_FTEC_ProxyPushSupplier* proxy = ec->find_proxy_push_supplier(op.object_id); - if (proxy == NULL){ + if (proxy == 0){ obtain_push_supplier_and_connect(ec, op.object_id, param.push_consumer.in(), @@ -125,7 +125,7 @@ void disconnect_push_supplier(TAO_FTEC_Event_Channel_Impl* ec, TAO_FTEC_ProxyPushSupplier* proxy = ec->find_proxy_push_supplier(op.object_id); - if (proxy == NULL) // proxy not found + if (proxy == 0) // proxy not found throw FTRT::InvalidUpdate(); proxy->disconnect_push_supplier(); @@ -138,7 +138,7 @@ void disconnect_push_consumer(TAO_FTEC_Event_Channel_Impl* ec, TAO_FTEC_ProxyPushConsumer* proxy = ec->find_proxy_push_consumer(op.object_id); - if (proxy == NULL) // proxy not found + if (proxy == 0) // proxy not found throw FTRT::InvalidUpdate(); proxy->disconnect_push_consumer(); @@ -153,7 +153,7 @@ void suspend_connection (TAO_FTEC_Event_Channel_Impl* ec, TAO_FTEC_ProxyPushSupplier* proxy = ec->find_proxy_push_supplier(op.object_id); - if (proxy == NULL) // proxy not found + if (proxy == 0) // proxy not found throw FTRT::InvalidUpdate(); proxy->suspend_connection(); @@ -165,7 +165,7 @@ void resume_connection(TAO_FTEC_Event_Channel_Impl* ec, TAO_FTEC_ProxyPushSupplier* proxy = ec->find_proxy_push_supplier(op.object_id); - if (proxy == NULL) // proxy not found + if (proxy == 0) // proxy not found throw FTRT::InvalidUpdate(); proxy->resume_connection(); @@ -332,7 +332,7 @@ void TAO_FTEC_Event_Channel_Impl::disconnect_push_supplier ( TAO_FTEC_ProxyPushSupplier* proxy = this->find_proxy_push_supplier(oid); - if (proxy == NULL) // proxy not found + if (proxy == 0) // proxy not found return; proxy->disconnect_push_supplier(); @@ -347,7 +347,7 @@ void TAO_FTEC_Event_Channel_Impl::disconnect_push_consumer ( TAO_FTEC_ProxyPushConsumer* proxy = this->find_proxy_push_consumer(oid); - if (proxy == NULL) // proxy not found + if (proxy == 0) // proxy not found return; proxy->disconnect_push_consumer(); @@ -362,7 +362,7 @@ void TAO_FTEC_Event_Channel_Impl::suspend_push_supplier ( TAO_FTEC_ProxyPushSupplier* proxy = this->find_proxy_push_supplier(oid); - if (proxy == NULL) // proxy not found + if (proxy == 0) // proxy not found throw FtRtecEventComm::InvalidObjectID(); proxy->suspend_connection(); @@ -378,7 +378,7 @@ void TAO_FTEC_Event_Channel_Impl::resume_push_supplier ( TAO_FTEC_ProxyPushSupplier* proxy = this->find_proxy_push_supplier(oid); - if (proxy == NULL) // proxy not found + if (proxy == 0) // proxy not found throw FtRtecEventComm::InvalidObjectID(); proxy->resume_connection(); @@ -391,7 +391,7 @@ void TAO_FTEC_Event_Channel_Impl::push ( { TAO_FTEC_ProxyPushConsumer* proxy = this->find_proxy_push_consumer(oid); - if (proxy == NULL) // proxy not found + if (proxy == 0) // proxy not found throw FtRtecEventComm::InvalidObjectID(); proxy->push(data); |