From f05ae06563766914b7fb6f3c5a487fbfb2099780 Mon Sep 17 00:00:00 2001 From: bala Date: Fri, 31 Oct 2003 16:16:39 +0000 Subject: ChangeLogTag:Fri Oct 31 10:14:22 2003 Balachandran Natarajan --- TAO/ChangeLog | 23 ++++++++++++++++------ .../FT_ClientRequest_Interceptor.cpp | 7 ++++--- .../FT_ServerRequest_Interceptor.cpp | 2 ++ 3 files changed, 23 insertions(+), 9 deletions(-) diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 6004d202cd9..ec5b71c3060 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,16 @@ +Fri Oct 31 10:14:22 2003 Balachandran Natarajan + + * orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.cpp: + + Added a comment for Dale + + * orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp: + + Fix in the main trunk trunk never got moved to the branch. + + These changes are in oci_haft_branch. They haven't been compiled + yet. + Thu Oct 30 10:08:11 2003 Dale Wilson * orbsvcs\tests\FaultTolerance\IOGRManipulation\FaultTolerance_IOGRManipulation.mpc: @@ -7,14 +20,12 @@ Thu Oct 30 10:08:11 2003 Dale Wilson Wed Oct 29 18:20:12 2003 Balachandran Natarajan - * orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.cpp: - - Made a simple mistake while trying to look at the number of - arguments. - + * orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.cpp: - These changes were made in the oci_haft branch. + Made a simple mistake while trying to look at the number of + arguments. + These changes were made in the oci_haft branch. Wed Oct 29 13:52:36 2003 Dale Wilson diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp index e63433369ca..8c6030f6087 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp @@ -222,9 +222,10 @@ namespace TAO cdr.reset_byte_order (ACE_static_cast (int,byte_order)); - FT::FTGroupVersionServiceContext gvsc; + // @@ Dale I made a change here... + FT::TagFTGroupTaggedComponent gtc; - if ((cdr >> gvsc) == 0) + if ((cdr >> gtc) == 0) ACE_THROW (CORBA::BAD_PARAM (CORBA::OMGVMCID | 28, CORBA::COMPLETED_NO)); @@ -235,7 +236,7 @@ namespace TAO if (!(ocdr << ACE_OutputCDR::from_boolean (TAO_ENCAP_BYTE_ORDER))) ACE_THROW (CORBA::MARSHAL ()); - if (!(ocdr << gvsc)) + if (!(ocdr << gtc.object_group_ref_version)) ACE_THROW (CORBA::MARSHAL ()); CORBA::ULong length = diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.cpp index 148a647f478..8aec6da5a68 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.cpp @@ -149,6 +149,8 @@ namespace TAO if (fgvsc.object_group_ref_version > this->object_group_ref_version_) { + // @@ Dale, could you please make this a warning. Add TAO_debug_level + // around this. ACE_ERROR ((LM_ERROR, "TAO-FT (%P|%t) - Wrong version information " "within the interceptor [%u | %u] \n", -- cgit v1.2.1