diff options
| author | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-02-18 16:42:22 +0000 |
|---|---|---|
| committer | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-02-18 16:42:22 +0000 |
| commit | 8b6ce24c6ff3ae72ee45dece539686918615f43f (patch) | |
| tree | 00619b7a3685720651d7e7788d4f4ece4e76348e | |
| parent | 856afa2b3f93ec772143d957236a5c06ec9e9618 (diff) | |
| download | ATCD-8b6ce24c6ff3ae72ee45dece539686918615f43f.tar.gz | |
ChangeLogTag:Fri Feb 18 08:39:05 2000 Carlos O'Ryan <coryan@uci.edu>
| -rw-r--r-- | TAO/ChangeLogs/ChangeLog-02a | 16 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp | 2 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp | 3 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h | 3 |
4 files changed, 15 insertions, 9 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index 66c5150c13e..d1ef655db61 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,9 +1,17 @@ +Fri Feb 18 08:39:05 2000 Carlos O'Ryan <coryan@uci.edu> + + * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp: + * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h: + * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp: + Fixed several exception specs, i guess it was too much + cut&paste ;-) + Fri Feb 18 00:48:43 2000 Nanbor Wang <nanbor@cs.wustl.edu> - * tao/SHMIOP_Factory.cpp (requires_explicit_endpoint): Changed to - return 1, i.e., do not create a SHMIOP endpoint if not - explicitly specified by users. Thanks to Carlos for pointing - this out. + * tao/SHMIOP_Factory.cpp (requires_explicit_endpoint): Changed to + return 1, i.e., do not create a SHMIOP endpoint if not + explicitly specified by users. Thanks to Carlos for pointing + this out. Thu Feb 17 21:48:42 2000 Carlos O'Ryan <coryan@uci.edu> diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp index f6e521ad6d4..6efef9ba2f4 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp @@ -47,7 +47,7 @@ TAO_CEC_ProxyPullConsumer::try_pull_from_supplier ( ACE_Lock, ace_mon, *this->lock_, CORBA::INTERNAL ()); // @@ CosEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ()); - ACE_CHECK; + ACE_CHECK_RETURN (0); if (this->is_connected_i () == 0) return 0; // ACE_THROW (CosEventComm::Disconnected ());???? diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp index a6f031d8ac1..126a8c7c86b 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp @@ -201,8 +201,7 @@ TAO_CEC_ProxyPullSupplier::connect_pull_consumer ( CosEventComm::PullConsumer_ptr pull_consumer, CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException, - CosEventChannelAdmin::AlreadyConnected, - CosEventChannelAdmin::TypeError)) + CosEventChannelAdmin::AlreadyConnected)) { { ACE_GUARD_THROW_EX ( diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h index 9d177c6f4e1..7ff01a48ec6 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h @@ -82,8 +82,7 @@ public: CosEventComm::PullConsumer_ptr pull_consumer, CORBA::Environment &) ACE_THROW_SPEC ((CORBA::SystemException, - CosEventChannelAdmin::AlreadyConnected, - CosEventChannelAdmin::TypeError)); + CosEventChannelAdmin::AlreadyConnected)); virtual CORBA::Any * pull (CORBA::Environment &) ACE_THROW_SPEC ((CORBA::SystemException,CosEventComm::Disconnected)); virtual CORBA::Any * try_pull (CORBA::Boolean_out has_event, |