summaryrefslogtreecommitdiff
path: root/TAO/examples/POA/Forwarding/Servant_Locator.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/examples/POA/Forwarding/Servant_Locator.cpp')
-rw-r--r--TAO/examples/POA/Forwarding/Servant_Locator.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/TAO/examples/POA/Forwarding/Servant_Locator.cpp b/TAO/examples/POA/Forwarding/Servant_Locator.cpp
index d5533779dc3..180cb15f302 100644
--- a/TAO/examples/POA/Forwarding/Servant_Locator.cpp
+++ b/TAO/examples/POA/Forwarding/Servant_Locator.cpp
@@ -42,14 +42,15 @@ MyFooServantLocator::~MyFooServantLocator ()
PortableServer::Servant
MyFooServantLocator::preinvoke (const PortableServer::ObjectId &oid,
PortableServer::POA_ptr /* poa_ptr */,
- const char * /*operation*/,
+ const char *operation,
PortableServer::ServantLocator::Cookie & /* cookie */,
CORBA::Environment &ACE_TRY_ENV)
{
- // ACE_UNUSED_ARG (operation);
+ ACE_UNUSED_ARG (operation);
if (this->forwarding_ == 0) // do not forward
{
+
// Convert ObjectID to String.
CORBA::String_var s = PortableServer::ObjectId_to_string (oid);
@@ -83,9 +84,7 @@ MyFooServantLocator::preinvoke (const PortableServer::ObjectId &oid,
else // now forward, in throwing the ForwardRequest Exception
{
// Throw forward exception
- ACE_THROW_RETURN (PortableServer::ForwardRequest (
- CORBA::Object::_duplicate (this->forward_to_var_.in ())),
- 0);
+ ACE_THROW_RETURN (PortableServer::ForwardRequest (), 0);
}
}
@@ -104,3 +103,4 @@ MyFooServantLocator::forward (CORBA::Environment &)
{
this->forwarding_ = 1;
}
+