diff options
Diffstat (limited to 'TAO/tests/Portable_Interceptors')
33 files changed, 230 insertions, 196 deletions
diff --git a/TAO/tests/Portable_Interceptors/Bug_3582/Client_Request_Interceptor.h b/TAO/tests/Portable_Interceptors/Bug_3582/Client_Request_Interceptor.h index 3753fc5ccdc..c9090eae741 100644 --- a/TAO/tests/Portable_Interceptors/Bug_3582/Client_Request_Interceptor.h +++ b/TAO/tests/Portable_Interceptors/Bug_3582/Client_Request_Interceptor.h @@ -27,7 +27,6 @@ class Client_Request_Interceptor public virtual ::CORBA::LocalObject { public: - /// Constructor. Client_Request_Interceptor (const char *orb_id, const char *forward_str); @@ -63,7 +62,6 @@ public: //@} private: - ///The ID of the ORB this interceptor is registered with. CORBA::String_var orb_id_; @@ -75,7 +73,6 @@ private: CORBA::ULong request_count_; CORBA::String_var forward_str_; - }; #if defined(_MSC_VER) diff --git a/TAO/tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.cpp index 2af09d07db9..a51d948d3a1 100644 --- a/TAO/tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.cpp @@ -5,6 +5,10 @@ #include "client_interceptor.h" +Echo_Client_ORBInitializer::Echo_Client_ORBInitializer (int& result) : result_ (result) +{ +} + void Echo_Client_ORBInitializer::pre_init ( PortableInterceptor::ORBInitInfo_ptr) @@ -21,14 +25,13 @@ Echo_Client_ORBInitializer::post_init ( // Install the Echo client request interceptor ACE_NEW_THROW_EX (interceptor, - Echo_Client_Request_Interceptor, + Echo_Client_Request_Interceptor (this->result_), CORBA::NO_MEMORY ()); PortableInterceptor::ClientRequestInterceptor_var client_interceptor = interceptor; info->add_client_request_interceptor (client_interceptor.in ()); - } #endif /* TAO_HAS_INTERCEPTORS == 1 */ diff --git a/TAO/tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.h index 84cdaa3c472..4a6ed849fed 100644 --- a/TAO/tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.h +++ b/TAO/tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.h @@ -27,10 +27,14 @@ class Echo_Client_ORBInitializer : public virtual ::CORBA::LocalObject { public: + Echo_Client_ORBInitializer (int& result); virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info); virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info); + +private: + int& result_; }; #if defined(_MSC_VER) diff --git a/TAO/tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.cpp index 095a32b08e0..f50e351c6f2 100644 --- a/TAO/tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.cpp @@ -5,6 +5,10 @@ #include "server_interceptor.h" +Echo_Server_ORBInitializer::Echo_Server_ORBInitializer (int& result) : result_ (result) +{ +} + void Echo_Server_ORBInitializer::pre_init ( PortableInterceptor::ORBInitInfo_ptr) @@ -21,7 +25,7 @@ Echo_Server_ORBInitializer::post_init ( // Install the Echo server request interceptor ACE_NEW_THROW_EX (interceptor, - Echo_Server_Request_Interceptor, + Echo_Server_Request_Interceptor (this->result_), CORBA::NO_MEMORY ()); PortableInterceptor::ServerRequestInterceptor_var diff --git a/TAO/tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.h index d2c2e6de155..c611cdf28eb 100644 --- a/TAO/tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.h +++ b/TAO/tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.h @@ -27,10 +27,14 @@ class Echo_Server_ORBInitializer : public virtual ::CORBA::LocalObject { public: + Echo_Server_ORBInitializer (int& result); virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info); virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info); + +private: + int& result_; }; #if defined(_MSC_VER) diff --git a/TAO/tests/Portable_Interceptors/Dynamic/README b/TAO/tests/Portable_Interceptors/Dynamic/README index 6f494bcdf76..a2e686c1941 100644 --- a/TAO/tests/Portable_Interceptors/Dynamic/README +++ b/TAO/tests/Portable_Interceptors/Dynamic/README @@ -1,5 +1,3 @@ - - This test allows you to visually check the correct invocation of TAO's pseudo-portable interceptors, especially the Dynamic interface. diff --git a/TAO/tests/Portable_Interceptors/Dynamic/client.cpp b/TAO/tests/Portable_Interceptors/Dynamic/client.cpp index c0153f9e365..0917bb12eaf 100644 --- a/TAO/tests/Portable_Interceptors/Dynamic/client.cpp +++ b/TAO/tests/Portable_Interceptors/Dynamic/client.cpp @@ -38,12 +38,10 @@ run_test (Test_Interceptors::Visual_ptr server) { CORBA::String_var msg; - server->normal (10, - msg.out ()); + server->normal (10, msg.out ()); CORBA::Long one = 1, two = 1, result = 0; - result = server->calculate (one, - two); + result = server->calculate (one, two); ACE_DEBUG ((LM_DEBUG, "calculate() result = %d\n", @@ -81,6 +79,8 @@ run_test (Test_Interceptors::Visual_ptr server) int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { + int result = 0; + try { #if TAO_HAS_INTERCEPTORS == 1 @@ -88,7 +88,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) PortableInterceptor::ORBInitializer::_nil (); ACE_NEW_RETURN (temp_initializer, - Echo_Client_ORBInitializer, + Echo_Client_ORBInitializer (result), -1); // No exceptions yet! PortableInterceptor::ORBInitializer_var orb_initializer = temp_initializer; @@ -128,5 +128,5 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) return 1; } - return 0; + return result; } diff --git a/TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.cpp b/TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.cpp index af4dab6e0b9..5249375a979 100644 --- a/TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.cpp +++ b/TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.cpp @@ -6,38 +6,32 @@ #include "tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.h" #include "ace/Log_Msg.h" -#include "ace/OS_NS_string.h" +#include <cstring> -Echo_Client_Request_Interceptor::Echo_Client_Request_Interceptor (void) - : myname_ ("Echo_Client_Interceptor") -{ -} - -Echo_Client_Request_Interceptor::~Echo_Client_Request_Interceptor () +Echo_Client_Request_Interceptor::Echo_Client_Request_Interceptor (int& result) + : result_ (result) { } char * -Echo_Client_Request_Interceptor::name (void) +Echo_Client_Request_Interceptor::name () { - return CORBA::string_dup (this->myname_); + return CORBA::string_dup ("Echo_Client_Interceptor"); } void -Echo_Client_Request_Interceptor::destroy (void) +Echo_Client_Request_Interceptor::destroy () { } void -Echo_Client_Request_Interceptor::send_poll ( - PortableInterceptor::ClientRequestInfo_ptr) +Echo_Client_Request_Interceptor::send_poll (PortableInterceptor::ClientRequestInfo_ptr) { // Do nothing } void -Echo_Client_Request_Interceptor::send_request ( - PortableInterceptor::ClientRequestInfo_ptr ri) +Echo_Client_Request_Interceptor::send_request (PortableInterceptor::ClientRequestInfo_ptr ri) { bool catched_exception = false; try @@ -45,13 +39,15 @@ Echo_Client_Request_Interceptor::send_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) { + ++this->result_; ACE_ERROR ((LM_ERROR, "(%P|%t) ERROR, no exception when getting reply status\n")); } @@ -64,17 +60,15 @@ Echo_Client_Request_Interceptor::send_request ( op.in ())); // For the "normal" operation, get the argument list. - if (ACE_OS::strcmp (op.in (), - "normal") == 0) + if (std::strcmp (op.in (), "normal") == 0) { - Dynamic::ParameterList_var paramlist = - ri->arguments (); + Dynamic::ParameterList_var paramlist = ri->arguments (); if (paramlist->length () != 2) { + ++this->result_; ACE_ERROR ((LM_ERROR, "(%P|%t) All parameters not available\n")); - } CORBA::ULong first = 0, second = 1; // If you dont understand @@ -92,6 +86,7 @@ Echo_Client_Request_Interceptor::send_request ( if (param != 10) { + ++this->result_; ACE_ERROR ((LM_ERROR, "(%P|%t) ERROR in send_request while checking " "the value of the extracted " @@ -101,6 +96,7 @@ Echo_Client_Request_Interceptor::send_request ( CORBA::TypeCode_var second_typecode = paramlist[second].argument.type (); if (second_typecode->kind () != CORBA::tk_null) { + ++this->result_; ACE_ERROR ((LM_ERROR, "(%P|%t) ERROR in send_request while checking " "the type of the extracted out" @@ -110,10 +106,8 @@ Echo_Client_Request_Interceptor::send_request ( } void -Echo_Client_Request_Interceptor::receive_other ( - PortableInterceptor::ClientRequestInfo_ptr ri) +Echo_Client_Request_Interceptor::receive_other (PortableInterceptor::ClientRequestInfo_ptr ri) { - CORBA::String_var op = ri->operation (); ACE_DEBUG ((LM_DEBUG, @@ -123,8 +117,7 @@ Echo_Client_Request_Interceptor::receive_other ( } void -Echo_Client_Request_Interceptor::receive_reply ( - PortableInterceptor::ClientRequestInfo_ptr ri) +Echo_Client_Request_Interceptor::receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri) { CORBA::String_var op = ri->operation (); @@ -134,11 +127,9 @@ Echo_Client_Request_Interceptor::receive_reply ( op.in ())); // For the "normal" operation, get the argument list. - if (ACE_OS::strcmp (op.in (), - "normal") == 0) + if (std::strcmp (op.in (), "normal") == 0) { - Dynamic::ParameterList_var paramlist = - ri->arguments (); + Dynamic::ParameterList_var paramlist = ri->arguments (); if (paramlist->length () != 2) { @@ -153,6 +144,7 @@ Echo_Client_Request_Interceptor::receive_reply ( if (paramlist[first].mode != CORBA::PARAM_IN || paramlist[second].mode != CORBA::PARAM_OUT) { + ++this->result_; ACE_ERROR ((LM_ERROR, "(%P|%t) ERROR in the extracted argument list\n")); } @@ -162,6 +154,7 @@ Echo_Client_Request_Interceptor::receive_reply ( if (param != 10) { + ++this->result_; ACE_ERROR ((LM_ERROR, "(%P|%t) ERROR in send_request while checking " "the value of the extracted " @@ -174,9 +167,9 @@ Echo_Client_Request_Interceptor::receive_reply ( CORBA::String_var transfer (str); - if (ACE_OS::strcmp (str, - "DO_NOT_INSULT_MY_INTELLIGENCE") != 0) + if (std::strcmp (str, "DO_NOT_INSULT_MY_INTELLIGENCE") != 0) { + ++this->result_; ACE_ERROR ((LM_ERROR, "(%P|%t) ERROR in send_request while checking " "the value of the extracted " @@ -184,10 +177,9 @@ Echo_Client_Request_Interceptor::receive_reply ( } } - if (ACE_OS::strcmp (op.in (), "calculate") == 0) + if (std::strcmp (op.in (), "calculate") == 0) { - Dynamic::ParameterList_var paramlist = - ri->arguments (); + Dynamic::ParameterList_var paramlist = ri->arguments (); CORBA::Long param1, param2, result; CORBA::ULong i = 0; // index -- explicitly used to avoid @@ -206,11 +198,11 @@ Echo_Client_Request_Interceptor::receive_reply ( result)); } - if (ACE_OS::strcmp (op.in (), "_get_the_structure") == 0) + if (std::strcmp (op.in (), "_get_the_structure") == 0) { CORBA::Any_var a = ri->result (); - const Test_Interceptors::Visual::VarLenStruct * v = 0; + const Test_Interceptors::Visual::VarLenStruct * v = nullptr; (a.in ()) >>= v; @@ -227,7 +219,6 @@ void Echo_Client_Request_Interceptor::receive_exception ( PortableInterceptor::ClientRequestInfo_ptr ri) { - CORBA::String_var op = ri->operation (); ACE_DEBUG ((LM_DEBUG, @@ -235,9 +226,7 @@ Echo_Client_Request_Interceptor::receive_exception ( "from \"%C\"\n", op.in ())); - - CORBA::String_var exception_id = - ri->received_exception_id (); + CORBA::String_var exception_id = ri->received_exception_id (); ACE_DEBUG ((LM_DEBUG, "Exception ID = %C\n", diff --git a/TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.h b/TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.h index 5e340799c91..939e199f681 100644 --- a/TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.h +++ b/TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.h @@ -15,40 +15,34 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ +/// Client-side echo interceptor. For checking interceptor visually only. class Echo_Client_Request_Interceptor : public virtual PortableInterceptor::ClientRequestInterceptor, public virtual ::CORBA::LocalObject { - // = Client-side echo interceptor. For checking interceptor visually only. public: + Echo_Client_Request_Interceptor (int& result); - Echo_Client_Request_Interceptor (void); - // ctor. - - virtual char * name (void); // Canonical name of the interceptor. + char * name () override; - virtual void destroy (void); + void destroy () override; - virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr); + void send_poll (PortableInterceptor::ClientRequestInfo_ptr) override; - virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri); + void send_request (PortableInterceptor::ClientRequestInfo_ptr ri) override; - virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr); + void receive_other (PortableInterceptor::ClientRequestInfo_ptr) override; - virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri); + void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri) override; - virtual void receive_exception ( - PortableInterceptor::ClientRequestInfo_ptr ri); + void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri) override; protected: - - virtual ~Echo_Client_Request_Interceptor (void); - // dtor. + ~Echo_Client_Request_Interceptor () override = default; private: - const char *myname_; - + int& result_; }; #if defined(_MSC_VER) diff --git a/TAO/tests/Portable_Interceptors/Dynamic/run_test.pl b/TAO/tests/Portable_Interceptors/Dynamic/run_test.pl index 1113978c01a..3d1fb801bc5 100755 --- a/TAO/tests/Portable_Interceptors/Dynamic/run_test.pl +++ b/TAO/tests/Portable_Interceptors/Dynamic/run_test.pl @@ -52,7 +52,7 @@ if ($client->PutFile ($iorbase) == -1) { exit 1; } -$client_status = $CL->SpawnWaitKill ($server->ProcessStartWaitInterval() + 45); +$client_status = $CL->SpawnWaitKill ($server->ProcessStartWaitInterval()); if ($client_status != 0) { print STDERR "ERROR: client returned $client_status\n"; diff --git a/TAO/tests/Portable_Interceptors/Dynamic/server.cpp b/TAO/tests/Portable_Interceptors/Dynamic/server.cpp index 6ca15eecd4b..809cd868d40 100644 --- a/TAO/tests/Portable_Interceptors/Dynamic/server.cpp +++ b/TAO/tests/Portable_Interceptors/Dynamic/server.cpp @@ -2,7 +2,6 @@ #include "test_i.h" #include "Echo_Server_ORBInitializer.h" #include "ace/OS_NS_stdio.h" - #include "tao/ORBInitializer_Registry.h" const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); @@ -35,6 +34,7 @@ parse_args (int argc, ACE_TCHAR *argv[]) int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { + int result = 0; try { #if TAO_HAS_INTERCEPTORS == 1 @@ -42,7 +42,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) PortableInterceptor::ORBInitializer::_nil (); ACE_NEW_RETURN (temp_initializer, - Echo_Server_ORBInitializer, + Echo_Server_ORBInitializer (result), -1); // No exceptions yet! PortableInterceptor::ORBInitializer_var orb_initializer = temp_initializer; @@ -86,7 +86,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) CORBA::String_var ior = orb->object_to_string (server.in ()); - ACE_DEBUG ((LM_DEBUG, "Test_Interceptors::Visual: <%s>\n", ior.in ())); + ACE_DEBUG ((LM_DEBUG, "Test_Interceptors::Visual: <%C>\n", ior.in ())); // If the ior_output_file exists, output the ior to it if (ior_output_file != 0) @@ -115,5 +115,5 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) return 1; } - return 0; + return result; } diff --git a/TAO/tests/Portable_Interceptors/Dynamic/server_interceptor.cpp b/TAO/tests/Portable_Interceptors/Dynamic/server_interceptor.cpp index 4f12e95e2d5..20671f6c34b 100644 --- a/TAO/tests/Portable_Interceptors/Dynamic/server_interceptor.cpp +++ b/TAO/tests/Portable_Interceptors/Dynamic/server_interceptor.cpp @@ -6,32 +6,99 @@ #include "testC.h" #include "ace/Log_Msg.h" -#include "ace/OS_NS_string.h" +#include <cstring> -Echo_Server_Request_Interceptor::Echo_Server_Request_Interceptor (void) - : myname_ ("Echo_Server_Interceptor") -{ -} - -Echo_Server_Request_Interceptor::~Echo_Server_Request_Interceptor () +Echo_Server_Request_Interceptor::Echo_Server_Request_Interceptor (int& result) + : result_ (result) { } char * -Echo_Server_Request_Interceptor::name (void) +Echo_Server_Request_Interceptor::name () { - return CORBA::string_dup (this->myname_); + return CORBA::string_dup ("Echo_Server_Interceptor"); } void -Echo_Server_Request_Interceptor::destroy (void) +Echo_Server_Request_Interceptor::destroy () { } void Echo_Server_Request_Interceptor::receive_request_service_contexts ( - PortableInterceptor::ServerRequestInfo_ptr) + PortableInterceptor::ServerRequestInfo_ptr ri) { + bool catched_exception = false; + try + { + CORBA::String_var tmdi = ri->target_most_derived_interface (); + } + catch (const ::CORBA::BAD_INV_ORDER& ex) + { + // BAD_INV_ORDER should be thrown with minor code 14 + catched_exception = (ex.minor () == (CORBA::OMGVMCID | 14)); + } + + if (!catched_exception) + { + ++this->result_; + ACE_ERROR ((LM_ERROR, + "(%P|%t) ERROR, no exception when calling target_most_derived_interface from receive_request_service_contexts\n")); + } + + catched_exception = false; + try + { + CORBA::Boolean tmdi = ri->target_is_a ("FOO"); + } + catch (const ::CORBA::BAD_INV_ORDER& ex) + { + // BAD_INV_ORDER should be thrown with minor code 14 + catched_exception = (ex.minor () == (CORBA::OMGVMCID | 14)); + } + + if (!catched_exception) + { + ++this->result_; + ACE_ERROR ((LM_ERROR, + "(%P|%t) ERROR, no exception when calling target_is_a from receive_request_service_contexts\n")); + } + + catched_exception = false; + try + { + PortableInterceptor::ReplyStatus tmdi = ri->reply_status (); + } + catch (const ::CORBA::BAD_INV_ORDER& ex) + { + // BAD_INV_ORDER should be thrown with minor code 14 + catched_exception = (ex.minor () == (CORBA::OMGVMCID | 14)); + } + + if (!catched_exception) + { + ++this->result_; + ACE_ERROR ((LM_ERROR, + "(%P|%t) ERROR, no exception when calling reply_status from receive_request_service_contexts\n")); + } + + catched_exception = false; + try + { + Dynamic::ParameterList_var paramlist = ri->arguments (); + } + catch (const ::CORBA::BAD_INV_ORDER& ex) + { + // BAD_INV_ORDER should be thrown with minor code 14 + catched_exception = (ex.minor () == (CORBA::OMGVMCID | 14)); + } + + if (!catched_exception) + { + ++this->result_; + ACE_ERROR ((LM_ERROR, + "(%P|%t) ERROR, no exception when calling arguments from receive_request_service_contexts\n")); + } } void @@ -44,13 +111,15 @@ 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) { + ++this->result_; ACE_ERROR ((LM_ERROR, "(%P|%t) ERROR, no exception when getting reply status\n")); } @@ -61,10 +130,26 @@ Echo_Server_Request_Interceptor::receive_request ( "Echo_Server_Request_Interceptor::receive_request from \"%C\"\n", op.in ())); - if (ACE_OS::strcmp (op.in (), "normal") == 0) + CORBA::Boolean targetisa = ri->target_is_a ("FOO"); + if (targetisa) { - Dynamic::ParameterList_var paramlist = - ri->arguments (); + ++this->result_; + ACE_ERROR ((LM_ERROR, + "(%P|%t) ERROR in receive_request while checking " + "target_is_a, it is not a FOO\n")); + } + targetisa = ri->target_is_a ("IDL:Test_Interceptors/Visual:1.0"); + if (!targetisa) + { + ++this->result_; + ACE_ERROR ((LM_ERROR, + "(%P|%t) ERROR in receive_request while checking " + "target_is_a, it should be IDL:Test_Interceptors/Visual:1.0\n")); + } + + if (std::strcmp (op.in (), "normal") == 0) + { + Dynamic::ParameterList_var paramlist = ri->arguments (); CORBA::Long param; CORBA::ULong i = 0; // index -- explicitly used to avoid @@ -79,6 +164,7 @@ Echo_Server_Request_Interceptor::receive_request ( CORBA::TypeCode_var second_typecode = paramlist[i].argument.type (); if (second_typecode->kind () != CORBA::tk_null) { + ++this->result_; ACE_ERROR ((LM_ERROR, "(%P|%t) ERROR in receive_request while checking " "the type of the extracted out" @@ -86,29 +172,51 @@ Echo_Server_Request_Interceptor::receive_request ( } } - CORBA::String_var tmdi = - ri->target_most_derived_interface (); + CORBA::String_var tmdi = ri->target_most_derived_interface (); ACE_DEBUG ((LM_DEBUG, "Target most derived interface: %C\n", tmdi.in ())); + + if (std::strcmp (tmdi.in (), "IDL:Test_Interceptors/Visual:1.0") != 0) + { + ++this->result_; + ACE_ERROR ((LM_ERROR, + "(%P|%t) ERROR in receive_request while checking " + "target_most_derived_interface\n")); + } + + catched_exception = false; + try + { + PortableInterceptor::ReplyStatus tmdi = ri->reply_status (); + } + catch (const ::CORBA::BAD_INV_ORDER& ex) + { + // BAD_INV_ORDER should be thrown with minor code 14 + catched_exception = (ex.minor () == (CORBA::OMGVMCID | 14)); + } + + if (!catched_exception) + { + ++this->result_; + ACE_ERROR ((LM_ERROR, + "(%P|%t) ERROR, no exception when calling reply_status from receive_request\n")); + } } void -Echo_Server_Request_Interceptor::send_reply ( - PortableInterceptor::ServerRequestInfo_ptr ri) +Echo_Server_Request_Interceptor::send_reply (PortableInterceptor::ServerRequestInfo_ptr ri) { - CORBA::String_var op = ri->operation (); ACE_DEBUG ((LM_DEBUG, "Echo_Server_Request_Interceptor::send_reply from \"%C\"\n", op.in ())); - if (ACE_OS::strcmp (op.in (), "normal") == 0) + if (std::strcmp (op.in (), "normal") == 0) { - Dynamic::ParameterList_var paramlist = - ri->arguments (); + Dynamic::ParameterList_var paramlist = ri->arguments (); CORBA::Long param; CORBA::ULong i = 0; // index -- explicitly used to avoid @@ -119,10 +227,9 @@ Echo_Server_Request_Interceptor::send_reply ( param)); } - if (ACE_OS::strcmp (op.in (), "calculate") == 0) + if (std::strcmp (op.in (), "calculate") == 0) { - Dynamic::ParameterList_var paramlist = - ri->arguments (); + Dynamic::ParameterList_var paramlist = ri->arguments (); CORBA::Long param1, param2, result = 0; CORBA::ULong i = 0; // index -- explicitly used to avoid @@ -146,7 +253,6 @@ void Echo_Server_Request_Interceptor::send_exception ( PortableInterceptor::ServerRequestInfo_ptr ri) { - CORBA::String_var op = ri->operation (); ACE_DEBUG ((LM_DEBUG, @@ -154,17 +260,15 @@ Echo_Server_Request_Interceptor::send_exception ( "from \"%C\"\n", op.in ())); - - CORBA::Any_var any = - ri->sending_exception (); + CORBA::Any_var any = ri->sending_exception (); CORBA::TypeCode_var type = any->type (); - const char *exception_id = type->id (); + CORBA::String_var exception_id = type->id (); ACE_DEBUG ((LM_DEBUG, "Exception ID = %C\n", - exception_id)); + exception_id.in ())); } void diff --git a/TAO/tests/Portable_Interceptors/Dynamic/server_interceptor.h b/TAO/tests/Portable_Interceptors/Dynamic/server_interceptor.h index da47f879f3a..b0a99af2ab6 100644 --- a/TAO/tests/Portable_Interceptors/Dynamic/server_interceptor.h +++ b/TAO/tests/Portable_Interceptors/Dynamic/server_interceptor.h @@ -15,38 +15,34 @@ #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 (void); - // cotr. + Echo_Server_Request_Interceptor (int& result); - virtual char * name (void); // Canonical name of the interceptor. + char * name () override; - virtual void destroy (void); + void destroy () override; - virtual void receive_request_service_contexts (PortableInterceptor::ServerRequestInfo_ptr); + void receive_request_service_contexts (PortableInterceptor::ServerRequestInfo_ptr) override; - virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri); + void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri) override; - virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri); + void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri) override; - virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri); + void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri) override; - virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr); + void send_other (PortableInterceptor::ServerRequestInfo_ptr) override; protected: - - virtual ~Echo_Server_Request_Interceptor (void); - // dotr. + ~Echo_Server_Request_Interceptor () override = default; private: - const char *myname_; - + int& result_; }; #if defined(_MSC_VER) diff --git a/TAO/tests/Portable_Interceptors/Dynamic/test_i.cpp b/TAO/tests/Portable_Interceptors/Dynamic/test_i.cpp index 540b0e2ebd3..600905ee3ce 100644 --- a/TAO/tests/Portable_Interceptors/Dynamic/test_i.cpp +++ b/TAO/tests/Portable_Interceptors/Dynamic/test_i.cpp @@ -4,7 +4,6 @@ Visual_i::Visual_i (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)) { } - // ctor void Visual_i::normal (CORBA::Long arg, @@ -23,9 +22,9 @@ Visual_i::calculate (CORBA::Long one, } Test_Interceptors::Visual::VarLenStruct * -Visual_i::the_structure (void) +Visual_i::the_structure () { - Test_Interceptors::Visual::VarLenStruct * s; + Test_Interceptors::Visual::VarLenStruct * s = nullptr; ACE_NEW_THROW_EX (s, Test_Interceptors::Visual::VarLenStruct, @@ -40,21 +39,21 @@ Visual_i::the_structure (void) } void -Visual_i::user (void) +Visual_i::user () { ACE_DEBUG ((LM_DEBUG, "Visual::user, throwing Silly\n")); throw Test_Interceptors::Silly (); } void -Visual_i::system (void) +Visual_i::system () { ACE_DEBUG ((LM_DEBUG, "Visual::user, throwing INV_OBJREF\n")); throw CORBA::INV_OBJREF (); } void -Visual_i::shutdown (void) +Visual_i::shutdown () { this->orb_->shutdown (); } diff --git a/TAO/tests/Portable_Interceptors/Dynamic/test_i.h b/TAO/tests/Portable_Interceptors/Dynamic/test_i.h index 2e8230b8576..03d5177ae04 100644 --- a/TAO/tests/Portable_Interceptors/Dynamic/test_i.h +++ b/TAO/tests/Portable_Interceptors/Dynamic/test_i.h @@ -19,24 +19,20 @@ class Visual_i : public POA_Test_Interceptors::Visual public: Visual_i (CORBA::ORB_ptr orb); - virtual CORBA::Long calculate (CORBA::Long one, - CORBA::Long two); + CORBA::Long calculate (CORBA::Long one, CORBA::Long two) override; - void normal (CORBA::Long arg, - CORBA::String_out msg); + void normal (CORBA::Long arg, CORBA::String_out msg) override; - virtual Test_Interceptors::Visual::VarLenStruct * the_structure (); + Test_Interceptors::Visual::VarLenStruct * the_structure () override; - virtual void user (void); + void user () override; - virtual void system (void); + void system () override; - virtual void shutdown (void); + void shutdown () override; private: - CORBA::ORB_var orb_; - }; #endif /* TAO_INTERCEPTOR_TEST_I_H */ diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/Client_Request_Interceptor.h b/TAO/tests/Portable_Interceptors/ForwardRequest/Client_Request_Interceptor.h index 37728cbd5b4..df858f6df1f 100644 --- a/TAO/tests/Portable_Interceptors/ForwardRequest/Client_Request_Interceptor.h +++ b/TAO/tests/Portable_Interceptors/ForwardRequest/Client_Request_Interceptor.h @@ -48,7 +48,6 @@ class Client_Request_Interceptor public virtual ::CORBA::LocalObject { public: - /// Constructor. Client_Request_Interceptor (const char *orb_id, const char *forward_str); @@ -84,7 +83,6 @@ public: //@} private: - ///The ID of the ORB this interceptor is registered with. CORBA::String_var orb_id_; @@ -98,7 +96,6 @@ private: /// Stringified reference to the object the initial request will be /// forwarded to by this interceptor. CORBA::String_var forward_str_; - }; #if defined(_MSC_VER) diff --git a/TAO/tests/Portable_Interceptors/PICurrent/ClientORBInitializer.h b/TAO/tests/Portable_Interceptors/PICurrent/ClientORBInitializer.h index d915986215d..d4a5cbd430e 100644 --- a/TAO/tests/Portable_Interceptors/PICurrent/ClientORBInitializer.h +++ b/TAO/tests/Portable_Interceptors/PICurrent/ClientORBInitializer.h @@ -25,7 +25,6 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ - // Test's SlotId made global for ease of implementation. // It is initialized to a large number to make it obvious when the // SlotId is invalid. @@ -34,7 +33,6 @@ // if thread-safety is an issue!!! extern PortableInterceptor::SlotId slot_id; - /** * @class ClientORBInitializer * @@ -48,7 +46,6 @@ class ClientORBInitializer : public virtual ::CORBA::LocalObject { public: - /** * @name Methods Required by the ORBInitializer Interface * @@ -65,7 +62,6 @@ public: virtual void post_init ( PortableInterceptor::ORBInitInfo_ptr info); //@} - }; #if defined(_MSC_VER) diff --git a/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor.h b/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor.h index 7b7f18aac6b..0bca4b49de4 100644 --- a/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor.h +++ b/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor.h @@ -43,7 +43,6 @@ class ClientRequestInterceptor public virtual ::CORBA::LocalObject { public: - /// Constructor. ClientRequestInterceptor (PortableInterceptor::SlotId slot_id, PortableInterceptor::Current_ptr pi_current); @@ -79,14 +78,12 @@ public: //@} private: - /// The PICurrent slot ID allocated to this application during ORB /// initialization. PortableInterceptor::SlotId slot_id_; /// Reference to the PICurrent object. PortableInterceptor::Current_var pi_current_; - }; #if defined(_MSC_VER) diff --git a/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor2.h b/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor2.h index 4d3bafe639d..bb69b5c1e82 100644 --- a/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor2.h +++ b/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor2.h @@ -40,7 +40,6 @@ class ClientRequestInterceptor2 public virtual ::CORBA::LocalObject { public: - /// Constructor. ClientRequestInterceptor2 (PortableInterceptor::SlotId slot_id); @@ -75,11 +74,9 @@ public: //@} private: - /// The PICurrent slot ID allocated to this application during ORB /// initialization. PortableInterceptor::SlotId slot_id_; - }; #if defined(_MSC_VER) diff --git a/TAO/tests/Portable_Interceptors/PICurrent/README b/TAO/tests/Portable_Interceptors/PICurrent/README index 605ac2c1260..98e491468d7 100644 --- a/TAO/tests/Portable_Interceptors/PICurrent/README +++ b/TAO/tests/Portable_Interceptors/PICurrent/README @@ -1,5 +1,3 @@ - - This test verifies that the "PICurrent" object semantics are correct on both the client side and the server side. In particular, it attempts to make sure the request scope current (RSC) and thread scope diff --git a/TAO/tests/Portable_Interceptors/PICurrent/ServerORBInitializer.h b/TAO/tests/Portable_Interceptors/PICurrent/ServerORBInitializer.h index fe70c86f8eb..4985cf7d4de 100644 --- a/TAO/tests/Portable_Interceptors/PICurrent/ServerORBInitializer.h +++ b/TAO/tests/Portable_Interceptors/PICurrent/ServerORBInitializer.h @@ -49,7 +49,6 @@ class ServerORBInitializer : public virtual ::CORBA::LocalObject { public: - /** * @name Methods Required by the ORBInitializer Interface * @@ -66,7 +65,6 @@ public: virtual void post_init ( PortableInterceptor::ORBInitInfo_ptr info); //@} - }; #if defined(_MSC_VER) diff --git a/TAO/tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.h b/TAO/tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.h index 8be04ba5395..d9990d5b102 100644 --- a/TAO/tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.h +++ b/TAO/tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.h @@ -42,7 +42,6 @@ class ServerRequestInterceptor public virtual ::CORBA::LocalObject { public: - /// Constructor. ServerRequestInterceptor (PortableInterceptor::SlotId id, PortableInterceptor::Current_ptr pi_current); @@ -78,14 +77,12 @@ public: //@} private: - /// The PICurrent slot ID allocated to this application during ORB /// initialization. PortableInterceptor::SlotId slot_id_; /// Reference to the PICurrent object. PortableInterceptor::Current_var pi_current_; - }; #if defined(_MSC_VER) diff --git a/TAO/tests/Portable_Interceptors/PICurrent/test_i.h b/TAO/tests/Portable_Interceptors/PICurrent/test_i.h index cda81e4f4ed..9e370707c0e 100644 --- a/TAO/tests/Portable_Interceptors/PICurrent/test_i.h +++ b/TAO/tests/Portable_Interceptors/PICurrent/test_i.h @@ -29,7 +29,6 @@ class test_i : public virtual POA_PICurrentTest::test { public: - /// Constructor. test_i (PortableInterceptor::Current_ptr current, PortableInterceptor::SlotId id, @@ -53,7 +52,6 @@ public: virtual void shutdown (void); private: - /// Reference to the PICurrent object. PortableInterceptor::Current_var current_; @@ -62,7 +60,6 @@ private: /// Pseudo-reference to the ORB. CORBA::ORB_var orb_; - }; #endif /* TEST_I_H */ diff --git a/TAO/tests/Portable_Interceptors/Redirection/Client_Request_Interceptor.h b/TAO/tests/Portable_Interceptors/Redirection/Client_Request_Interceptor.h index 3753fc5ccdc..c9090eae741 100644 --- a/TAO/tests/Portable_Interceptors/Redirection/Client_Request_Interceptor.h +++ b/TAO/tests/Portable_Interceptors/Redirection/Client_Request_Interceptor.h @@ -27,7 +27,6 @@ class Client_Request_Interceptor public virtual ::CORBA::LocalObject { public: - /// Constructor. Client_Request_Interceptor (const char *orb_id, const char *forward_str); @@ -63,7 +62,6 @@ public: //@} private: - ///The ID of the ORB this interceptor is registered with. CORBA::String_var orb_id_; @@ -75,7 +73,6 @@ private: CORBA::ULong request_count_; CORBA::String_var forward_str_; - }; #if defined(_MSC_VER) diff --git a/TAO/tests/Portable_Interceptors/Redirection/Server_Request_Interceptor.h b/TAO/tests/Portable_Interceptors/Redirection/Server_Request_Interceptor.h index 1f2abcbc24b..5907543ac8b 100644 --- a/TAO/tests/Portable_Interceptors/Redirection/Server_Request_Interceptor.h +++ b/TAO/tests/Portable_Interceptors/Redirection/Server_Request_Interceptor.h @@ -26,7 +26,6 @@ class Server_Request_Interceptor public virtual ::CORBA::LocalObject { public: - /// Constructor. Server_Request_Interceptor (void); @@ -61,15 +60,12 @@ public: //@} protected: - /// Destructor. ~Server_Request_Interceptor (void); private: - /// The number of requests intercepted by this interceptor. CORBA::ULong request_count_; - }; #if defined(_MSC_VER) diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_ORBInitializer.h index a6adcaee7d7..66aef9277e6 100644 --- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_ORBInitializer.h +++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_ORBInitializer.h @@ -8,7 +8,6 @@ */ //============================================================================= - #ifndef TAO_CLIENT_ORB_INITIALIZER_H #define TAO_CLIENT_ORB_INITIALIZER_H @@ -42,11 +41,9 @@ class Client_ORBInitializer : public virtual ::CORBA::LocalObject { public: - virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info); virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info); - }; #if defined(_MSC_VER) diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_Request_Interceptor.h b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_Request_Interceptor.h index 514796e720e..0b6a17e2bb0 100644 --- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_Request_Interceptor.h +++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_Request_Interceptor.h @@ -43,7 +43,6 @@ class Client_Request_Interceptor public virtual Request_Interceptor { public: - /// Constructor. Client_Request_Interceptor (const char *name); @@ -73,12 +72,10 @@ public: //@} private: - // Returns 1 if the client-side test is currently being run, and 0 // otherwise. CORBA::Boolean client_side_test ( PortableInterceptor::ClientRequestInfo_ptr info); - }; #if defined(_MSC_VER) diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/README b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/README index a002c1bbc16..86f889bfa0c 100644 --- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/README +++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/README @@ -1,12 +1,9 @@ - - NOTE: The code in this test is highly specialized and very brittle. Do not use it as a model for "real world" interceptor code. - This test verifies that proper request interceptor flow semantics occur during a given request/invocation. It does so by executing a -canned (hard-coded) set of scenarios. Each scenario excercises a +canned (hard-coded) set of scenarios. Each scenario exercises a specific flow behavior. All scenarios correspond to the ones detailed in the Portable Interceptor specification (00-04-05). They are listed below: diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Request_Interceptor.h b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Request_Interceptor.h index ded8412f970..662b8e79d85 100644 --- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Request_Interceptor.h +++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Request_Interceptor.h @@ -42,7 +42,6 @@ class Request_Interceptor : public virtual PortableInterceptor::Interceptor { public: - /// Constructor. Request_Interceptor (const char *name); @@ -62,7 +61,6 @@ public: //@} protected: - /// The name of this interceptor. CORBA::String_var name_; @@ -75,7 +73,6 @@ protected: /// called. ACE_Atomic_Op<TAO_SYNCH_MUTEX, CORBA::ULong> ending_interception_point_count_; - }; #if defined(_MSC_VER) diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_ORBInitializer.h index bf6e9a79b15..4f9f1a17d5f 100644 --- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_ORBInitializer.h +++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_ORBInitializer.h @@ -42,11 +42,9 @@ class Server_ORBInitializer : public virtual ::CORBA::LocalObject { public: - virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info); virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info); - }; #if defined(_MSC_VER) diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_Request_Interceptor.cpp b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_Request_Interceptor.cpp index 435eb4e6a3d..0caaf005906 100644 --- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_Request_Interceptor.cpp +++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_Request_Interceptor.cpp @@ -15,7 +15,6 @@ void Server_Request_Interceptor::receive_request_service_contexts ( PortableInterceptor::ServerRequestInfo_ptr ri) { - CORBA::Boolean server_side = this->server_side_test (ri); @@ -58,7 +57,6 @@ void Server_Request_Interceptor::receive_request ( PortableInterceptor::ServerRequestInfo_ptr ri) { - CORBA::Boolean server_side = this->server_side_test (ri); @@ -129,7 +127,6 @@ void Server_Request_Interceptor::send_exception ( PortableInterceptor::ServerRequestInfo_ptr ri) { - CORBA::Boolean server_side = this->server_side_test (ri); @@ -206,7 +203,6 @@ void Server_Request_Interceptor::send_other ( PortableInterceptor::ServerRequestInfo_ptr ri) { - CORBA::Boolean server_side = this->server_side_test (ri); diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_Request_Interceptor.h b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_Request_Interceptor.h index 524842dd5a3..79f396b40fc 100644 --- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_Request_Interceptor.h +++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_Request_Interceptor.h @@ -44,7 +44,6 @@ class Server_Request_Interceptor public virtual Request_Interceptor { public: - /// Constructor. Accepts the name of the interceptor. Server_Request_Interceptor (const char *name); @@ -74,14 +73,12 @@ public: //@} private: - /// Returns 1 if the server-side test is currently being run, and 0 /// otherwise. CORBA::Boolean server_side_test ( PortableInterceptor::ServerRequestInfo_ptr info); private: - /// Variable used to keep track of the scenario count. Used to get /// around the inability to call RequestInfo::arguments() in the /// receive_service_contexts() interception point. diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/test_i.h b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/test_i.h index 654eb1a4a1b..91260b771db 100644 --- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/test_i.h +++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/test_i.h @@ -26,7 +26,6 @@ class test_i : public virtual POA_Test { public: - /// Constructor. test_i (CORBA::ORB_ptr orb); @@ -41,10 +40,8 @@ public: virtual void shutdown (void); private: - /// Pseudo-reference to the ORB. CORBA::ORB_var orb_; - }; #endif /* TEST_I_H */ |