[certi-cvs] certi/libCERTI ObjectClass.cc

[certi-cvs]

CVSROOT:        /sources/certi
Module name:    certi
Changes by:     Eric NOULARD <erk>      11/03/25 19:28:59

Modified files:
        libCERTI       : ObjectClass.cc 

Log message:
        Fix bug #32905 : invoking of unconditionalAttributeOwnershipDivestiture 
results in RTIG crash
        Merged patch from Eugene.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/ObjectClass.cc?cvsroot=certi&r1=3.83&r2=3.84

Patches:
Index: ObjectClass.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/ObjectClass.cc,v
retrieving revision 3.83
retrieving revision 3.84
diff -u -b -r3.83 -r3.84
--- ObjectClass.cc      20 Aug 2010 15:15:32 -0000      3.83
+++ ObjectClass.cc      25 Mar 2011 19:28:58 -0000      3.84
@@ -19,7 +19,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 // USA
 //
-// $Id: ObjectClass.cc,v 3.83 2010/08/20 15:15:32 erk Exp $
+// $Id: ObjectClass.cc,v 3.84 2011/03/25 19:28:58 erk Exp $
 // ----------------------------------------------------------------------------
 
 #include  "Object.hh"
@@ -112,7 +112,6 @@
     // 2. Update message attribute list by removing child's attributes.
     if ((ocbList->getMsg()->getMessageType() == 
NetworkMessage::REFLECT_ATTRIBUTE_VALUES) ||
         (ocbList->getMsg()->getMessageType() == 
NetworkMessage::REQUEST_ATTRIBUTE_OWNERSHIP_ASSUMPTION)) {
-
         for (uint32_t attr = 0; attr < 
(ocbList->getMsgRAV()->getAttributesSize());) {
             // If the attribute is not in that class, remove it from the 
message.
             if (hasAttribute(ocbList->getMsgRAV()->getAttributes(attr))) {
@@ -1225,7 +1224,6 @@
            RTIinternalError)
 {
     // Pre-conditions checking
-
     // Do all attribute handles exist ? It may throw AttributeNotDefined.
     for (unsigned index = 0 ; index < theAttributeList.size() ; index++)
         getAttribute(theAttributeList[index]);
@@ -1241,12 +1239,13 @@
 
     int compteur_assumption = 0 ;
     int compteur_acquisition = 0 ;
-    NM_Request_Attribute_Ownership_Assumption *AnswerAssumption = NULL ;
+    NM_Unconditional_Attribute_Ownership_Divestiture *AnswerAssumption = NULL ;
     ObjectClassBroadcastList *List = NULL ;
     FederateHandle NewOwner ;
 
     if (server != NULL) {
-        AnswerAssumption = new NM_Request_Attribute_Ownership_Assumption();
+      
+        AnswerAssumption = new 
NM_Unconditional_Attribute_Ownership_Divestiture();
         AnswerAssumption->setAttributesSize(theAttributeList.size());
         CDiffusion *diffusionAcquisition = new CDiffusion();
 
@@ -1712,4 +1711,4 @@
 
 } // namespace certi
 
-// $Id: ObjectClass.cc,v 3.83 2010/08/20 15:15:32 erk Exp $
+// $Id: ObjectClass.cc,v 3.84 2011/03/25 19:28:58 erk Exp $