diff options
| author | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2001-02-22 04:25:41 +0000 |
|---|---|---|
| committer | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2001-02-22 04:25:41 +0000 |
| commit | 6ab3c06d7dd5666b31d759f8dbb0cfbb169da582 (patch) | |
| tree | 63bd603f3ed78a5b0c0295f896739023b1be50f8 | |
| parent | 04ea405ded2add1a551c57cfb95fa83c702505d8 (diff) | |
| download | ATCD-6ab3c06d7dd5666b31d759f8dbb0cfbb169da582.tar.gz | |
ChangeLogTag:Wed Feb 21 20:17:22 2001 Carlos O'Ryan <coryan@uci.edu>
| -rw-r--r-- | TAO/ChangeLogs/ChangeLog-02a | 11 | ||||
| -rw-r--r-- | TAO/tests/Multiple/Multiple_Impl.cpp | 11 |
2 files changed, 14 insertions, 8 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index 18d454f2afd..b239bbb704d 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,7 +1,14 @@ +Wed Feb 21 20:17:22 2001 Carlos O'Ryan <coryan@uci.edu> + + * tests/Multiple/Multiple_Impl.cpp: + Don't return a string when an exception is raised. This is not + only non-compliant, it is a bad idea: the receiver is supposed + to ignore all return values, because they are invalid. + Wed Feb 21 21:04:03 2001 Nanbor Wang <nanbor@cs.wustl.edu> - * tests/RTCORBA/MT_Client_Protocol_Priority/run_test.pl: Fixed - incorrect usage of SHMIOP endpoint specifier. + * tests/RTCORBA/MT_Client_Protocol_Priority/run_test.pl: Fixed + incorrect usage of SHMIOP endpoint specifier. Wed Feb 21 08:38:05 2001 Carlos O'Ryan <coryan@uci.edu> diff --git a/TAO/tests/Multiple/Multiple_Impl.cpp b/TAO/tests/Multiple/Multiple_Impl.cpp index 478f80666bc..d9b5f03a2cc 100644 --- a/TAO/tests/Multiple/Multiple_Impl.cpp +++ b/TAO/tests/Multiple/Multiple_Impl.cpp @@ -18,6 +18,7 @@ Bottom_Impl::~Bottom_Impl (void) { // No-Op. } + char * Bottom_Impl::top_quote (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) @@ -82,7 +83,7 @@ Delegated_Bottom_Impl::top_quote (CORBA::Environment &ACE_TRY_ENV) CORBA::String_var msg = this->delegate_->top_quote (ACE_TRY_ENV); - ACE_CHECK_RETURN ("ERROR"); + ACE_CHECK_RETURN (0); return msg._retn (); } @@ -95,7 +96,7 @@ Delegated_Bottom_Impl::left_quote (CORBA::Environment &ACE_TRY_ENV) CORBA::String_var msg = this->delegate_->left_quote (ACE_TRY_ENV); - ACE_CHECK_RETURN ("ERROR"); + ACE_CHECK_RETURN (0); return msg._retn (); } @@ -108,7 +109,7 @@ Delegated_Bottom_Impl::right_quote (CORBA::Environment &ACE_TRY_ENV) CORBA::String_var msg = this->delegate_->right_quote (ACE_TRY_ENV); - ACE_CHECK_RETURN ("ERROR"); + ACE_CHECK_RETURN (0); return msg._retn (); } @@ -121,7 +122,7 @@ Delegated_Bottom_Impl::bottom_quote (CORBA::Environment &ACE_TRY_ENV) CORBA::String_var msg = this->delegate_->bottom_quote (ACE_TRY_ENV); - ACE_CHECK_RETURN ("ERROR"); + ACE_CHECK_RETURN (0); return msg._retn (); } @@ -134,6 +135,4 @@ Delegated_Bottom_Impl::shutdown (CORBA::Environment &ACE_TRY_ENV) this->delegate_->shutdown (ACE_TRY_ENV); //this->orb_->shutdown (0, ACE_TRY_ENV); ACE_CHECK; - - } |