summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcoryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1999-03-13 03:05:55 +0000
committercoryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1999-03-13 03:05:55 +0000
commitbfa3e8156139dd66a65e35ad6b6e7afbe2d0d159 (patch)
tree9e14c22980849d0b4f75dea2d92e79d3a7967db3
parent98b8d7c079d8ac1d74533a3d52cfb569da3d65ca (diff)
downloadATCD-bfa3e8156139dd66a65e35ad6b6e7afbe2d0d159.tar.gz
ChangeLogTag:Fri Mar 12 20:48:00 1999 Carlos O'Ryan <coryan@cs.wustl.edu>
-rw-r--r--TAO/ChangeLog-99c4
-rw-r--r--TAO/tao/Invocation.cpp2
2 files changed, 5 insertions, 1 deletions
diff --git a/TAO/ChangeLog-99c b/TAO/ChangeLog-99c
index ec1a478b953..3e7f6e1df5c 100644
--- a/TAO/ChangeLog-99c
+++ b/TAO/ChangeLog-99c
@@ -3,6 +3,10 @@ Fri Mar 12 20:48:00 1999 Carlos O'Ryan <coryan@cs.wustl.edu>
* orbsvcs/tests/ImplRepo/IR_Helper.cpp:
Fixed improper use of TAO_RETHROW macros.
+ * tao/Invocation.cpp:
+ Fixed problem in location forwarding, the test for errors while
+ demarshaling the new object reference was inverted.
+
Fri Mar 12 19:51:36 1999 Carlos O'Ryan <coryan@cs.wustl.edu>
* TAO_IDL/be/be_visitor_operation/operation_cs.cpp:
diff --git a/TAO/tao/Invocation.cpp b/TAO/tao/Invocation.cpp
index 6dbcd6bcc18..4dd3a635255 100644
--- a/TAO/tao/Invocation.cpp
+++ b/TAO/tao/Invocation.cpp
@@ -377,7 +377,7 @@ TAO_GIOP_Invocation::location_forward (TAO_InputCDR &inp_stream,
CORBA::Object_ptr object_ptr = 0;
TAO_Transport *transport = this->data_->profile_in_use ()->transport ();
- if ( (inp_stream >> object_ptr) != 0)
+ if ( (inp_stream >> object_ptr) == 0)
{
transport->close_connection ();
ACE_THROW_RETURN (CORBA::MARSHAL (CORBA::COMPLETED_NO),