summaryrefslogtreecommitdiff
path: root/TAO/tests/Interceptors
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/tests/Interceptors')
-rw-r--r--TAO/tests/Interceptors/client.cpp2
-rw-r--r--TAO/tests/Interceptors/interceptors.cpp20
-rw-r--r--TAO/tests/Interceptors/interceptors.h25
-rw-r--r--TAO/tests/Interceptors/server.cpp7
4 files changed, 36 insertions, 18 deletions
diff --git a/TAO/tests/Interceptors/client.cpp b/TAO/tests/Interceptors/client.cpp
index b518172e587..104a819c1b9 100644
--- a/TAO/tests/Interceptors/client.cpp
+++ b/TAO/tests/Interceptors/client.cpp
@@ -80,7 +80,7 @@ main (int argc, char *argv[])
// Installing the Echo interceptor
ACE_NEW_RETURN (interceptor,
- Echo_Client_Request_Interceptor (orb),
+ Echo_Client_Request_Interceptor (orb.in ()),
-1);
orb->_register_client_interceptor (interceptor);
diff --git a/TAO/tests/Interceptors/interceptors.cpp b/TAO/tests/Interceptors/interceptors.cpp
index c2c525c418b..5409d28346f 100644
--- a/TAO/tests/Interceptors/interceptors.cpp
+++ b/TAO/tests/Interceptors/interceptors.cpp
@@ -35,6 +35,7 @@ Echo_Client_Request_Interceptor::_remove_ref (void)
char *
Echo_Client_Request_Interceptor::name (CORBA::Environment &)
+ ACE_THROW_SPEC ((CORBA::SystemException))
{
return CORBA::string_dup (this->myname_);
}
@@ -48,6 +49,7 @@ Echo_Client_Request_Interceptor::preinvoke (CORBA::ULong rid,
CORBA::NVList_ptr &,
PortableInterceptor::Cookies &,
CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
{
CORBA::String_var ior = this->orb_->object_to_string (objref,
ACE_TRY_ENV);
@@ -57,7 +59,7 @@ Echo_Client_Request_Interceptor::preinvoke (CORBA::ULong rid,
"Echo_Client_Request_Interceptor::preinvoke from \"%s\" request_id: %d on object: %s\n",
op,
rid,
- ior));
+ ior.in ()));
CORBA::ULong length = sc.length ();
sc.length (length + 1);
@@ -82,6 +84,7 @@ Echo_Client_Request_Interceptor::postinvoke (CORBA::ULong rid,
CORBA::NVList_ptr &,
PortableInterceptor::Cookies &,
CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
{
CORBA::String_var ior = this->orb_->object_to_string (objref,
ACE_TRY_ENV);
@@ -91,7 +94,7 @@ Echo_Client_Request_Interceptor::postinvoke (CORBA::ULong rid,
"Echo_Client_Request_Interceptor::postinvoke from \"%s\" request_id: %d on object: %s\n",
op,
rid,
- ior));
+ ior.in ()));
for (CORBA::ULong size = 0; size < sc.length (); ++size)
if (sc[size].context_id == reply_ctx_id)
@@ -110,6 +113,7 @@ Echo_Client_Request_Interceptor::exception_occurred (CORBA::ULong rid,
const char * op,
PortableInterceptor::Cookies &,
CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
{
CORBA::String_var ior = this->orb_->object_to_string (objref,
ACE_TRY_ENV);
@@ -119,7 +123,7 @@ Echo_Client_Request_Interceptor::exception_occurred (CORBA::ULong rid,
"Echo_Client_Request_Interceptor::exception_occurred from \"%s\" request_id: %d on object: %s\n",
op,
rid,
- ior));
+ ior.in ()));
}
Echo_Server_Request_Interceptor::Echo_Server_Request_Interceptor (CORBA::ORB_ptr orb)
@@ -148,6 +152,7 @@ Echo_Server_Request_Interceptor::_remove_ref (void)
char *
Echo_Server_Request_Interceptor::name (CORBA::Environment &)
+ ACE_THROW_SPEC ((CORBA::SystemException))
{
return CORBA::string_dup (this->myname_);
}
@@ -161,6 +166,7 @@ Echo_Server_Request_Interceptor::preinvoke (CORBA::ULong rid,
CORBA::NVList_ptr &,
PortableInterceptor::Cookies &,
CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
{
CORBA::String_var ior = this->orb_->object_to_string (objref,
ACE_TRY_ENV);
@@ -170,7 +176,7 @@ Echo_Server_Request_Interceptor::preinvoke (CORBA::ULong rid,
"Echo_Server_Request_Interceptor::preinvoke from \"%s\" request_id: %d on object: %s\n",
op,
rid,
- ior));
+ ior.in ()));
for (CORBA::ULong size = 0; size < sc.length (); ++size)
if (sc[size].context_id == request_ctx_id)
@@ -191,6 +197,7 @@ Echo_Server_Request_Interceptor::postinvoke (CORBA::ULong rid,
CORBA::NVList_ptr &,
PortableInterceptor::Cookies &,
CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
{
CORBA::String_var ior = this->orb_->object_to_string (objref,
ACE_TRY_ENV);
@@ -200,7 +207,7 @@ Echo_Server_Request_Interceptor::postinvoke (CORBA::ULong rid,
"Echo_Server_Request_Interceptor::postinvoke from \"%s\" request_id: %d on object: %s\n",
op,
rid,
- ior));
+ ior.in ()));
CORBA::ULong length = sc.length ();
sc.length (length + 1);
@@ -223,6 +230,7 @@ Echo_Server_Request_Interceptor::exception_occurred (CORBA::ULong rid,
const char * op,
PortableInterceptor::Cookies &,
CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
{
CORBA::String_var ior = this->orb_->object_to_string (objref,
ACE_TRY_ENV);
@@ -232,5 +240,5 @@ Echo_Server_Request_Interceptor::exception_occurred (CORBA::ULong rid,
"Echo_Server_Request_Interceptor::exception_occurred from \"%s\" request_id: %d on object: %s\n",
op,
rid,
- ior));
+ ior.in ()));
}
diff --git a/TAO/tests/Interceptors/interceptors.h b/TAO/tests/Interceptors/interceptors.h
index c7f0b4f7700..daefbdea18c 100644
--- a/TAO/tests/Interceptors/interceptors.h
+++ b/TAO/tests/Interceptors/interceptors.h
@@ -26,7 +26,9 @@ public:
virtual void _remove_ref (void);
// Decrement the reference count.
- virtual char * name (CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ());
+ virtual char * name (CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+ ACE_THROW_SPEC ((CORBA::SystemException));
+
// Canonical name of the interceptor.
virtual void preinvoke (CORBA::ULong request_id,
@@ -36,7 +38,8 @@ public:
IOP::ServiceContextList & sc,
CORBA::NVList_ptr &args,
PortableInterceptor::Cookies & ck,
- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ());
+ CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+ ACE_THROW_SPEC ((CORBA::SystemException));
virtual void postinvoke (CORBA::ULong request_id,
CORBA::Boolean response_expected,
@@ -45,14 +48,16 @@ public:
IOP::ServiceContextList & sc,
CORBA::NVList_ptr &args,
PortableInterceptor::Cookies & ck,
- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ());
+ CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+ ACE_THROW_SPEC ((CORBA::SystemException));
virtual void exception_occurred (CORBA::ULong request_id,
CORBA::Boolean response_expected,
CORBA::Object_ptr objref,
const char * operation_name,
PortableInterceptor::Cookies & ck,
- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ());
+ CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+ ACE_THROW_SPEC ((CORBA::SystemException));
private:
const char *myname_;
@@ -77,7 +82,8 @@ public:
virtual void _remove_ref (void);
// Decrement the reference count.
- virtual char * name (CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ());
+ virtual char * name (CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+ ACE_THROW_SPEC ((CORBA::SystemException));
// Canonical name of the interceptor.
virtual void preinvoke (CORBA::ULong request_id,
@@ -87,7 +93,8 @@ public:
IOP::ServiceContextList & sc,
CORBA::NVList_ptr &args,
PortableInterceptor::Cookies & ck,
- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ());
+ CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+ ACE_THROW_SPEC ((CORBA::SystemException));
virtual void postinvoke (CORBA::ULong request_id,
CORBA::Boolean response_expected,
@@ -96,14 +103,16 @@ public:
IOP::ServiceContextList & sc,
CORBA::NVList_ptr &args,
PortableInterceptor::Cookies & ck,
- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ());
+ CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+ ACE_THROW_SPEC ((CORBA::SystemException));
virtual void exception_occurred (CORBA::ULong request_id,
CORBA::Boolean response_expected,
CORBA::Object_ptr objref,
const char * operation_name,
PortableInterceptor::Cookies & ck,
- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ());
+ CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+ ACE_THROW_SPEC ((CORBA::SystemException));
private:
const char *myname_;
diff --git a/TAO/tests/Interceptors/server.cpp b/TAO/tests/Interceptors/server.cpp
index 2aa7967453e..cd68c29f0de 100644
--- a/TAO/tests/Interceptors/server.cpp
+++ b/TAO/tests/Interceptors/server.cpp
@@ -46,7 +46,7 @@ main (int argc, char *argv[])
// Installing the Echo interceptor
ACE_NEW_RETURN (interceptor,
- Echo_Server_Request_Interceptor (orb),
+ Echo_Server_Request_Interceptor (orb.in ()),
-1);
orb->_register_server_interceptor (interceptor);
@@ -77,11 +77,12 @@ main (int argc, char *argv[])
CORBA::Object_var test_obj =
root_poa->id_to_reference (id.in (),
- ACE_TRY_ENV);
+ ACE_TRY_ENV);
ACE_CHECK_RETURN (0);
Test_Interceptors::Visual_var server =
- Test_Interceptors::Visual::_narrow (test_obj, ACE_TRY_ENV);
+ Test_Interceptors::Visual::_narrow (test_obj.in (),
+ ACE_TRY_ENV);
ACE_TRY_CHECK;
CORBA::String_var ior =
View Lorry Controller Status