summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorparsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2003-10-13 16:08:01 +0000
committerparsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2003-10-13 16:08:01 +0000
commit6f67059d9c32ea390f755cbbee54644968b5243d (patch)
treec925f77a31c750f8fb8c4e462550c535b2276538
parentd1d579700c40f2472948666c6d3e2211aeca0ece (diff)
downloadATCD-6f67059d9c32ea390f755cbbee54644968b5243d.tar.gz
ChangeLogTag: Mon Oct 13 11:05:58 2003 Jeff Parsons <j.parsons@vanderbilt.edu>
-rw-r--r--TAO/ChangeLog_ref7
-rw-r--r--TAO/tao/Invocation_Adapter.cpp7
2 files changed, 9 insertions, 5 deletions
diff --git a/TAO/ChangeLog_ref b/TAO/ChangeLog_ref
index 1ae2ea98a36..ba7f9cd679a 100644
--- a/TAO/ChangeLog_ref
+++ b/TAO/ChangeLog_ref
@@ -1,3 +1,10 @@
+Mon Oct 13 11:05:58 2003 Jeff Parsons <j.parsons@vanderbilt.edu>
+
+ * tao/Invocation_Adapter.cpp (object_forwarded):
+
+ Changed an ACE_THROW_RETURN to ACE_THROW, since object_forwarded()
+ is a void function.
+
Fri Oct 10 22:01:33 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu>
* tests/Portable_Interceptors/Service_Context_Manipulation/interceptors.cpp:
diff --git a/TAO/tao/Invocation_Adapter.cpp b/TAO/tao/Invocation_Adapter.cpp
index 47c4f3c9625..0ee4d82540a 100644
--- a/TAO/tao/Invocation_Adapter.cpp
+++ b/TAO/tao/Invocation_Adapter.cpp
@@ -366,14 +366,11 @@ namespace TAO
stub->add_forward_profiles (stubobj->base_profiles ());
if (stub->next_profile () == 0)
- ACE_THROW_RETURN (CORBA::TRANSIENT (
+ ACE_THROW (CORBA::TRANSIENT (
CORBA::SystemException::_tao_minor_code (
TAO_INVOCATION_LOCATION_FORWARD_MINOR_CODE,
errno),
- CORBA::COMPLETED_NO),
- TAO_INVOKE_FAILURE);
-
-
+ CORBA::COMPLETED_NO));
return;
}