diff options
| author | nanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-12-02 09:43:41 +0000 |
|---|---|---|
| committer | nanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-12-02 09:43:41 +0000 |
| commit | 0c3c0c65057a058342b46552a924d3dc499d3429 (patch) | |
| tree | 85788c2def9accf5582674948068fe3b131c03fb /TAO/tao/CDR.i | |
| parent | 08e7573845b7eea9a248febf52df21c04bb4389d (diff) | |
| download | ATCD-0c3c0c65057a058342b46552a924d3dc499d3429.tar.gz | |
Exception handling macros integration
Diffstat (limited to 'TAO/tao/CDR.i')
| -rw-r--r-- | TAO/tao/CDR.i | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/TAO/tao/CDR.i b/TAO/tao/CDR.i index 921f5d83ac5..43635caf4c6 100644 --- a/TAO/tao/CDR.i +++ b/TAO/tao/CDR.i @@ -681,9 +681,9 @@ TAO_InputCDR::skip (CORBA::TypeCode_ptr tc, TAO_Marshal_Object *mobj = this->factory_->make_marshal_object (tc, env); - if (env.exception() == 0 && mobj != 0) - return mobj->skip (tc, this, env); - return CORBA::TypeCode::TRAVERSE_STOP; + TAO_CHECK_CONDITION_ENV_RETURN (env, || mobj == 0, CORBA::TypeCode::TRAVERSE_STOP); + + return mobj->skip (tc, this, env); } ACE_INLINE size_t @@ -1141,7 +1141,7 @@ TAO_OutputCDR::append (CORBA::TypeCode_ptr tc, TAO_Marshal_Object *mobj = this->factory_->make_marshal_object (tc, env); - if (env.exception() == 0 && mobj != 0) - return mobj->append (tc, src, this, env); - return CORBA::TypeCode::TRAVERSE_STOP; + TAO_CHECK_CONDITION_ENV_RETURN (env, || mobj == 0, CORBA::TypeCode::TRAVERSE_STOP); + + return mobj->append (tc, src, this, env); } |