diff options
| author | Chris Cleeland <chris.cleeland@gmail.com> | 2005-09-29 15:29:30 +0000 |
|---|---|---|
| committer | Chris Cleeland <chris.cleeland@gmail.com> | 2005-09-29 15:29:30 +0000 |
| commit | 7bdc12b37c3c099624226cdca64b8973ecb29e9f (patch) | |
| tree | b377765e1533216426bda0d9a95457da50f9baee | |
| parent | 04b3f144f35fa8c598246f272ad84575b2e589a2 (diff) | |
| download | ATCD-7bdc12b37c3c099624226cdca64b8973ecb29e9f.tar.gz | |
Thu Sep 29 10:02:19 2005 Chris Cleeland <cleeland_c@ociweb.com>
| -rw-r--r-- | TAO/ChangeLog | 8 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.cpp | 9 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.cpp | 7 |
3 files changed, 21 insertions, 3 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 79fc3c0e7f0..18ff3a91457 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,11 @@ +Thu Sep 29 10:02:19 2005 Chris Cleeland <cleeland_c@ociweb.com> + + * orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.cpp: + * orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.cpp: + + De-fuzzed ACE_CHECK/ACE_TRY_CHECK warnings. Thanks to Johnny + Willemsen for catching this and holding my feet to the fire. + Thu Sep 29 09:12:24 2005 Chad Elliott <elliott_c@ociweb.com> * tao/SmartProxies/Smart_Proxies.h: diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.cpp index d7e822edf0a..c3abe25b30a 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.cpp @@ -38,7 +38,14 @@ TAO_EC_TPC_ProxyPushConsumer::disconnect_push_consumer ( ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->tpc_dispatching ()->remove_consumer (this->_this(ACE_ENV_SINGLE_ARG_PARAMETER) + RtecEventComm::PushConsumer_var emulated_exceptions_suck = + this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_CHECK; + + this->tpc_dispatching ()->remove_consumer (emulated_exceptions_suck.in () ACE_ENV_ARG_PARAMETER); + ACE_CHECK; + BASECLASS::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_CHECK; } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.cpp index 9e355655749..b431002f2bb 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.cpp @@ -29,8 +29,11 @@ TAO_EC_TPC_ProxyPushSupplier:: disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL this->consumer_.in())); if (this->is_connected_i ()) - this->tpc_dispatching ()->remove_consumer (this->consumer_.in() - ACE_ENV_ARG_PARAMETER); + { + this->tpc_dispatching ()->remove_consumer (this->consumer_.in() + ACE_ENV_ARG_PARAMETER); + ACE_CHECK; + } BASECLASS::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; |