[certi-cvs] certi RTIG/RTIG_processing.cc libCERTI/NM_Class...

[certi-cvs]

CVSROOT:        /sources/certi
Module name:    certi
Changes by:     Eric NOULARD <erk>      09/10/11 11:13:15

Modified files:
        RTIG           : RTIG_processing.cc 
        libCERTI       : NM_Classes.hh 
        RTIA           : OwnershipManagement.cc 

Log message:
        Merge-in
        patch #6940: Fix rtig crash on isAttributeOwnedByFederate
        from Matthias.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/certi/RTIG/RTIG_processing.cc?cvsroot=certi&r1=3.86&r2=3.87
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/NM_Classes.hh?cvsroot=certi&r1=3.13&r2=3.14
http://cvs.savannah.gnu.org/viewcvs/certi/RTIA/OwnershipManagement.cc?cvsroot=certi&r1=3.18&r2=3.19

Patches:
Index: RTIG/RTIG_processing.cc
===================================================================
RCS file: /sources/certi/certi/RTIG/RTIG_processing.cc,v
retrieving revision 3.86
retrieving revision 3.87
diff -u -b -r3.86 -r3.87
--- RTIG/RTIG_processing.cc     16 Sep 2009 07:56:31 -0000      3.86
+++ RTIG/RTIG_processing.cc     11 Oct 2009 11:13:15 -0000      3.87
@@ -18,7 +18,7 @@
 // along with this program ; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 //
-// $Id: RTIG_processing.cc,v 3.86 2009/09/16 07:56:31 erk Exp $
+// $Id: RTIG_processing.cc,v 3.87 2009/10/11 11:13:15 erk Exp $
 // ----------------------------------------------------------------------------
 
 #include <config.h>
@@ -1085,26 +1085,28 @@
 void
 RTIG::processAttributeOwnedByFederate(Socket *link, NetworkMessage *req)
 {
+    NM_Is_Attribute_Owned_By_Federate* ownedReq = 
static_cast<NM_Is_Attribute_Owned_By_Federate*>(req);
     NM_Is_Attribute_Owned_By_Federate rep ;
 
     D.Out(pdDebug, "Owner of Attribute %u of Object %u .",
-          req->handleArray[0], req->object);
+          ownedReq->getAttribute(), ownedReq->object);
 
-    auditServer << "AttributeHandle = " << req->handleArray[0] ;
+    auditServer << "AttributeHandle = " << ownedReq->getAttribute() ;
 
-    if (federations.isOwner(req->federation,
-                             req->federate,
-                             req->object,
-                             req->handleArray[0]))
+    if (federations.isOwner(ownedReq->federation,
+                             ownedReq->federate,
+                             ownedReq->object,
+                             ownedReq->getAttribute()))
         rep.setLabel("RTI_TRUE");
     else
         rep.setLabel("RTI_FALSE");
 
     D.Out(pdDebug, "Owner of Attribute %u of Object %u .",
-          req->handleArray[0], req->object);
+          ownedReq->getAttribute(), ownedReq->object);
 
-    rep.federate = req->federate ;
-    rep.object = req->object ;
+    rep.federate = ownedReq->federate ;
+    rep.object = ownedReq->object ;
+    rep.setAttribute(ownedReq->getAttribute()) ;
 
     rep.send(link,NM_msgBufSend); // send answer to RTIA
 }
@@ -1552,4 +1554,4 @@
 
 }} // namespace certi/rtig
 
-// $Id: RTIG_processing.cc,v 3.86 2009/09/16 07:56:31 erk Exp $
+// $Id: RTIG_processing.cc,v 3.87 2009/10/11 11:13:15 erk Exp $

Index: libCERTI/NM_Classes.hh
===================================================================
RCS file: /sources/certi/certi/libCERTI/NM_Classes.hh,v
retrieving revision 3.13
retrieving revision 3.14
diff -u -b -r3.13 -r3.14
--- libCERTI/NM_Classes.hh      14 Sep 2009 21:21:32 -0000      3.13
+++ libCERTI/NM_Classes.hh      11 Oct 2009 11:13:15 -0000      3.14
@@ -1096,6 +1096,8 @@
        virtual void serialize(MessageBuffer& msgBuffer);
        virtual void deserialize(MessageBuffer& msgBuffer);
        /* specific Getter/Setter */
+       AttributeHandle getAttribute() const {return attribute;};
+       void setAttribute(AttributeHandle newAttribute) 
{attribute=newAttribute;};
 protected:
        /* specific field */
        //      ObjectHandle    object;

Index: RTIA/OwnershipManagement.cc
===================================================================
RCS file: /sources/certi/certi/RTIA/OwnershipManagement.cc,v
retrieving revision 3.18
retrieving revision 3.19
diff -u -b -r3.18 -r3.19
--- RTIA/OwnershipManagement.cc 14 Sep 2009 21:21:32 -0000      3.18
+++ RTIA/OwnershipManagement.cc 11 Oct 2009 11:13:15 -0000      3.19
@@ -18,7 +18,7 @@
 // along with this program ; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 //
-// $Id: OwnershipManagement.cc,v 3.18 2009/09/14 21:21:32 erk Exp $
+// $Id: OwnershipManagement.cc,v 3.19 2009/10/11 11:13:15 erk Exp $
 // ----------------------------------------------------------------------------
 
 #include <config.h>
@@ -74,9 +74,7 @@
     req.federation = fm->_numero_federation ;
     req.federate = fm->federate ;
     req.object = theObject ;
-    req.handleArray.resize(1) ;
-    req.handleArray[0] = theAttribute ;
-    req.handleArraySize = 1 ;
+    req.setAttribute(theAttribute);
 
     D.Out(pdDebug, "Federate %u ", fm->federate);
 
@@ -514,4 +512,4 @@
 
 }} // namespace certi/rtia
 
-// $Id: OwnershipManagement.cc,v 3.18 2009/09/14 21:21:32 erk Exp $
+// $Id: OwnershipManagement.cc,v 3.19 2009/10/11 11:13:15 erk Exp $