diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2020-12-09 12:05:30 +0100 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2020-12-09 12:05:30 +0100 |
| commit | 895191139d5565425fdab280e5f459f610e5230c (patch) | |
| tree | 41a58cd93ee345cc3bef12531002f4ce8c700e3c | |
| parent | 1275e501fb13aae63cfe8af020dc92437da18758 (diff) | |
| download | ATCD-895191139d5565425fdab280e5f459f610e5230c.tar.gz | |
BAD_INV_ORDER should be thrown with minor code 14
* TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.cpp:
* TAO/tests/Portable_Interceptors/Dynamic/server_interceptor.cpp:
* TAO/tests/Portable_Interceptors/Dynamic/server_interceptor.h:
3 files changed, 8 insertions, 6 deletions
diff --git a/TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.cpp b/TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.cpp index a438933b32a..fa6b5ec4e1e 100644 --- a/TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.cpp +++ b/TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.cpp @@ -39,9 +39,10 @@ Echo_Client_Request_Interceptor::send_request (PortableInterceptor::ClientReques PortableInterceptor::ReplyStatus rstatus = ri->reply_status (); ACE_UNUSED_ARG (rstatus); } - catch (const ::CORBA::BAD_INV_ORDER&) + catch (const ::CORBA::BAD_INV_ORDER& ex) { - catched_exception = true; + // BAD_INV_ORDER should be thrown with minor code 14 + catched_exception = (ex.minor () == (CORBA::OMGVMCID | 14)); } if (!catched_exception) diff --git a/TAO/tests/Portable_Interceptors/Dynamic/server_interceptor.cpp b/TAO/tests/Portable_Interceptors/Dynamic/server_interceptor.cpp index f466a94ee61..fa5f7f1a060 100644 --- a/TAO/tests/Portable_Interceptors/Dynamic/server_interceptor.cpp +++ b/TAO/tests/Portable_Interceptors/Dynamic/server_interceptor.cpp @@ -40,9 +40,10 @@ Echo_Server_Request_Interceptor::receive_request ( PortableInterceptor::ReplyStatus rstatus = ri->reply_status (); ACE_UNUSED_ARG (rstatus); } - catch (const ::CORBA::BAD_INV_ORDER&) + catch (const ::CORBA::BAD_INV_ORDER& ex) { - catched_exception = true; + // BAD_INV_ORDER should be thrown with minor code 14 + catched_exception = (ex.minor () == (CORBA::OMGVMCID | 14)); } if (!catched_exception) diff --git a/TAO/tests/Portable_Interceptors/Dynamic/server_interceptor.h b/TAO/tests/Portable_Interceptors/Dynamic/server_interceptor.h index 1a83f384679..d7f728aab4f 100644 --- a/TAO/tests/Portable_Interceptors/Dynamic/server_interceptor.h +++ b/TAO/tests/Portable_Interceptors/Dynamic/server_interceptor.h @@ -15,16 +15,16 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ +/// Server-side echo interceptor. For checking interceptor visually only. class Echo_Server_Request_Interceptor : public PortableInterceptor::ServerRequestInterceptor, public virtual ::CORBA::LocalObject { - // = Server-side echo interceptor. For checking interceptor visually only. public: Echo_Server_Request_Interceptor (); - char * name () override; // Canonical name of the interceptor. + char * name () override; void destroy () override; |