[certi-cvs] certi RTIA/RTIA_federate.cc libCERTI/NetworkMes...

[certi-cvs]

CVSROOT:        /sources/certi
Module name:    certi
Changes by:     ROUSSELOT <rousse>      08/03/06 16:33:10

Modified files:
        RTIA           : RTIA_federate.cc 
        libCERTI       : NetworkMessage_RW.cc 

Log message:
        little corrections about request object attribute value update 
processing

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/certi/RTIA/RTIA_federate.cc?cvsroot=certi&r1=3.66&r2=3.67
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/NetworkMessage_RW.cc?cvsroot=certi&r1=3.44&r2=3.45

Patches:
Index: RTIA/RTIA_federate.cc
===================================================================
RCS file: /sources/certi/certi/RTIA/RTIA_federate.cc,v
retrieving revision 3.66
retrieving revision 3.67
diff -u -b -r3.66 -r3.67
--- RTIA/RTIA_federate.cc       27 Feb 2008 16:38:26 -0000      3.66
+++ RTIA/RTIA_federate.cc       6 Mar 2008 16:33:09 -0000       3.67
@@ -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: RTIA_federate.cc,v 3.66 2008/02/27 16:38:26 rousse Exp $
+// $Id: RTIA_federate.cc,v 3.67 2008/03/06 16:33:09 rousse Exp $
 // ----------------------------------------------------------------------------
 
 #include <config.h>
@@ -511,14 +511,12 @@
         break ;
 
       case Message::REQUEST_OBJECT_ATTRIBUTE_VALUE_UPDATE:
-        try {
             D.Out(pdTrace,"Receiving Message from Federate, type "
                                 "RequestAttributeValueUpadate.");
             om->requestObjectAttributeValueUpdate(req->getObject(),
                                             req->handleArray,
                                             req->handleArraySize,
                                             e);
-          } catch (Exception *e) { throw e ;}
         break ;
 
       case Message::REQUEST_CLASS_ATTRIBUTE_VALUE_UPDATE:
@@ -1306,4 +1304,4 @@
 
 }} // namespace certi/rtia
 
-// $Id: RTIA_federate.cc,v 3.66 2008/02/27 16:38:26 rousse Exp $
+// $Id: RTIA_federate.cc,v 3.67 2008/03/06 16:33:09 rousse Exp $

Index: libCERTI/NetworkMessage_RW.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/NetworkMessage_RW.cc,v
retrieving revision 3.44
retrieving revision 3.45
diff -u -b -r3.44 -r3.45
--- libCERTI/NetworkMessage_RW.cc       5 Mar 2008 15:33:51 -0000       3.44
+++ libCERTI/NetworkMessage_RW.cc       6 Mar 2008 16:33:10 -0000       3.45
@@ -16,7 +16,7 @@
 // License along with this program ; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 //
-// $Id: NetworkMessage_RW.cc,v 3.44 2008/03/05 15:33:51 rousse Exp $
+// $Id: NetworkMessage_RW.cc,v 3.45 2008/03/06 16:33:10 rousse Exp $
 // ----------------------------------------------------------------------------
 
 
@@ -103,10 +103,8 @@
 
       case PROVIDE_ATTRIBUTE_VALUE_UPDATE:
        object = body.readLongInt();
-       body.readBlock((char *) handleArray, handleArraySize * 
sizeof(AttributeHandle));
-       for (i = 0 ; i < handleArraySize ; i ++) {
+       for (i = 0 ; i < handleArraySize ; i ++)
                handleArray[i] = body.readShortInt();
-       }
        break ;
 
        
@@ -127,11 +125,8 @@
 
       case REQUEST_OBJECT_ATTRIBUTE_VALUE_UPDATE:
        object = body.readLongInt();
-       body.readBlock((char *) handleArray, handleArraySize * 
sizeof(AttributeHandle));
-       for (i = 0 ; i < handleArraySize ; i ++) {
-            ValueArray[i].length = body.readLongInt();
-            body.readBlock(ValueArray[i].value, ValueArray[i].length) ;
-       }
+       for (i = 0 ; i < handleArraySize ; i ++)
+           handleArray[i] = body.readShortInt();
        break ;
                
       case CREATE_FEDERATION_EXECUTION:
@@ -580,8 +575,8 @@
 
       case PROVIDE_ATTRIBUTE_VALUE_UPDATE:
        body.writeLongInt(object);
-       body.writeBlock((char *) handleArray, handleArraySize * 
sizeof(AttributeHandle));       
-       for (i = 0 ; i < handleArraySize ; i ++) {
+       for (i = 0 ; i < handleArraySize ; i ++)
+            {
            body.writeShortInt(handleArray[i]);
        }
        break ;
@@ -603,7 +598,6 @@
 
       case REQUEST_OBJECT_ATTRIBUTE_VALUE_UPDATE:
        body.writeLongInt(object);
-       body.writeBlock((char *) handleArray, handleArraySize * 
sizeof(AttributeHandle));       
        for (i = 0 ; i < handleArraySize ; i ++)
             {
            body.writeShortInt(handleArray[i]);
@@ -1067,4 +1061,4 @@
 
 } // namespace certi
 
-// $Id: NetworkMessage_RW.cc,v 3.44 2008/03/05 15:33:51 rousse Exp $
+// $Id: NetworkMessage_RW.cc,v 3.45 2008/03/06 16:33:10 rousse Exp $