diff options
| author | irfan <irfan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-12-08 00:42:35 +0000 |
|---|---|---|
| committer | irfan <irfan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-12-08 00:42:35 +0000 |
| commit | e8c5bb0d9688ab8acd2204c5d20d5c7254106e18 (patch) | |
| tree | 6097a743f99c3fb89f39b61eb3c34fce37fb3be8 | |
| parent | a7f572cdb16b8588a2ab4983e9f8d0d72a2d56af (diff) | |
| download | ATCD-e8c5bb0d9688ab8acd2204c5d20d5c7254106e18.tar.gz | |
*** empty log message ***
| -rw-r--r-- | TAO/tao/CDR.i | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/TAO/tao/CDR.i b/TAO/tao/CDR.i index 43635caf4c6..6ef5e9c8689 100644 --- a/TAO/tao/CDR.i +++ b/TAO/tao/CDR.i @@ -681,7 +681,10 @@ TAO_InputCDR::skip (CORBA::TypeCode_ptr tc, TAO_Marshal_Object *mobj = this->factory_->make_marshal_object (tc, env); - TAO_CHECK_CONDITION_ENV_RETURN (env, || mobj == 0, CORBA::TypeCode::TRAVERSE_STOP); + TAO_CHECK_ENV_RETURN (env, CORBA::TypeCode::TRAVERSE_STOP); + + if (mobj == 0) + return CORBA::TypeCode::TRAVERSE_STOP; return mobj->skip (tc, this, env); } @@ -1141,7 +1144,10 @@ TAO_OutputCDR::append (CORBA::TypeCode_ptr tc, TAO_Marshal_Object *mobj = this->factory_->make_marshal_object (tc, env); - TAO_CHECK_CONDITION_ENV_RETURN (env, || mobj == 0, CORBA::TypeCode::TRAVERSE_STOP); + TAO_CHECK_ENV_RETURN (env, CORBA::TypeCode::TRAVERSE_STOP); + + if (mobj == 0) + return CORBA::TypeCode::TRAVERSE_STOP; return mobj->append (tc, src, this, env); } |