diff options
| author | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-06-25 19:38:29 +0000 |
|---|---|---|
| committer | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-06-25 19:38:29 +0000 |
| commit | 86cb8acb6e86dd30a6528b59132beb771dd56cc2 (patch) | |
| tree | e50dabdf4721e01339edc0dce4406d661c0b9b7e /TAO | |
| parent | 998da65a13de6133f9bfa4d492e1765190e7bb86 (diff) | |
| download | ATCD-86cb8acb6e86dd30a6528b59132beb771dd56cc2.tar.gz | |
ChangeLogTag:Fri Jun 25 14:28:59 1999 Carlos O'Ryan <coryan@cs.wustl.edu>
Diffstat (limited to 'TAO')
| -rw-r--r-- | TAO/ChangeLog-99c | 13 | ||||
| -rw-r--r-- | TAO/tao/CurrentC.cpp | 3 | ||||
| -rw-r--r-- | TAO/tao/append.cpp | 2 | ||||
| -rw-r--r-- | TAO/tao/skip.cpp | 3 |
4 files changed, 17 insertions, 4 deletions
diff --git a/TAO/ChangeLog-99c b/TAO/ChangeLog-99c index 7fb3553f611..b1513346ea8 100644 --- a/TAO/ChangeLog-99c +++ b/TAO/ChangeLog-99c @@ -1,3 +1,15 @@ +Fri Jun 25 14:28:59 1999 Carlos O'Ryan <coryan@cs.wustl.edu> + + * tao/CurrentC.cpp: + Simplified exit path to avoid this problems. + + * tao/append.cpp: + Added .in() calls for some T_var objects. + + * tao/skip.cpp: + Added .in() calls for some T_var objects. + My last change broken the default case for unions. + Fri Jun 25 13:37:47 1999 Balachandran Natarajan <bala@cs.wustl.edu> * tao/Exception.cpp : @@ -364,6 +376,7 @@ Thu Jun 24 17:22:47 1999 Carlos O'Ryan <coryan@cs.wustl.edu> * performance-tests/Cubit/TAO/IDL_Cubit/collocation_test.cpp: * performance-tests/Cubit/TAO/MT_Cubit/Task_Client.h: * performance-tests/Thruput/TAO/client.cpp: + * performance-tests/Thruput/TAO/server.cpp: * performance-tests/Thruput/TAO/ttcp_decl.h: * performance-tests/Thruput/TAO/utils.cpp: * examples/OBV/Typed_Events/Client_i.h: diff --git a/TAO/tao/CurrentC.cpp b/TAO/tao/CurrentC.cpp index 9beb6cc3b0b..76e1e8aba99 100644 --- a/TAO/tao/CurrentC.cpp +++ b/TAO/tao/CurrentC.cpp @@ -111,12 +111,11 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_Current_ptr &_tao_ ACE_TRY_ENV); ACE_TRY_CHECK; } - return 1; } ACE_CATCHANY { return 0; } ACE_ENDTRY; - ACE_CHECK_RETURN (0); + return 1; } diff --git a/TAO/tao/append.cpp b/TAO/tao/append.cpp index ed9984cb9ff..36374ea33b5 100644 --- a/TAO/tao/append.cpp +++ b/TAO/tao/append.cpp @@ -121,7 +121,7 @@ TAO_Marshal_Any::append (CORBA::TypeCode_ptr, if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE) { // append the data - retval = dest->append (elem_tc, src, ACE_TRY_ENV); + retval = dest->append (elem_tc.in (), src, ACE_TRY_ENV); ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP); } } diff --git a/TAO/tao/skip.cpp b/TAO/tao/skip.cpp index f4e82240466..198e14147ff 100644 --- a/TAO/tao/skip.cpp +++ b/TAO/tao/skip.cpp @@ -115,7 +115,6 @@ TAO_Marshal_Any::skip (CORBA::TypeCode_ptr, retval = stream->skip (elem_tc.in (), ACE_TRY_ENV); ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP); } - CORBA::release (elem_tc); return retval; } @@ -491,6 +490,8 @@ TAO_Marshal_Union::skip (CORBA::TypeCode_ptr tc, return stream->skip (member_tc, ACE_TRY_ENV); } } + if (default_tc != 0) + return stream->skip (default_tc, ACE_TRY_ENV); } return retval; } |