[certi-cvs] certi libCERTI/Message.cc libRTI/RTIambassador....

[certi-cvs]

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

Modified files:
        libCERTI       : Message.cc 
        libRTI         : RTIambassador.cc 
        test/Billard   : Billard.cc 

Log message:
        #23469 Bug correction : Tag null in sendInteraction not allowed

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/Message.cc?cvsroot=certi&r1=3.53&r2=3.54
http://cvs.savannah.gnu.org/viewcvs/certi/libRTI/RTIambassador.cc?cvsroot=certi&r1=3.84&r2=3.85
http://cvs.savannah.gnu.org/viewcvs/certi/test/Billard/Billard.cc?cvsroot=certi&r1=3.34&r2=3.35

Patches:
Index: libCERTI/Message.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/Message.cc,v
retrieving revision 3.53
retrieving revision 3.54
diff -u -b -r3.53 -r3.54
--- libCERTI/Message.cc 29 May 2008 12:20:36 -0000      3.53
+++ libCERTI/Message.cc 3 Jun 2008 14:16:21 -0000       3.54
@@ -43,7 +43,7 @@
     exceptionReason[0] = '\0' ;
     federateName[0] = '\0' ;
     //federationName = NULL ;is now a string then...
-    tag[0] = '\0' ;
+    tag = "" ;
     name[0] = '\0' ;
     label[0] = '\0' ;
     handleArraySize = 0 ;

Index: libRTI/RTIambassador.cc
===================================================================
RCS file: /sources/certi/certi/libRTI/RTIambassador.cc,v
retrieving revision 3.84
retrieving revision 3.85
diff -u -b -r3.84 -r3.85
--- libRTI/RTIambassador.cc     3 Jun 2008 08:45:50 -0000       3.84
+++ libRTI/RTIambassador.cc     3 Jun 2008 14:16:22 -0000       3.85
@@ -19,7 +19,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 // USA
 //
-// $Id: RTIambassador.cc,v 3.84 2008/06/03 08:45:50 rousse Exp $
+// $Id: RTIambassador.cc,v 3.85 2008/06/03 14:16:22 rousse Exp $
 // ----------------------------------------------------------------------------
 
 
@@ -1237,7 +1237,11 @@
     req.type = Message::SEND_INTERACTION ;
     req.setInteractionClass(theInteraction);
     req.setFedTime(theTime);
-    req.setTag(theTag);
+    if (theTag == NULL)
+       {
+       throw RTIinternalError ("Calling sendInteraction with Tag null") ;
+       }
+    req.setTag((std::string)theTag);
     req.setPHVPS(theParameters);
     req.setRegion(0);
     req.setBoolean(true);
@@ -1269,7 +1273,11 @@
 
     req.type = Message::SEND_INTERACTION ;
     req.setInteractionClass(theInteraction);
-    req.setTag(theTag);
+    if (theTag == NULL)
+       {
+       throw RTIinternalError ("Calling sendIntercation with Tag null") ;
+       }
+    req.setTag((std::string)theTag);
     req.setPHVPS(theParameters);
     req.setRegion(0);
     req.setBoolean(false);
@@ -2960,4 +2968,4 @@
     privateRefs->executeService(&req, &rep);
 }
 
-// $Id: RTIambassador.cc,v 3.84 2008/06/03 08:45:50 rousse Exp $
+// $Id: RTIambassador.cc,v 3.85 2008/06/03 14:16:22 rousse Exp $

Index: test/Billard/Billard.cc
===================================================================
RCS file: /sources/certi/certi/test/Billard/Billard.cc,v
retrieving revision 3.34
retrieving revision 3.35
diff -u -b -r3.34 -r3.35
--- test/Billard/Billard.cc     3 Jun 2008 08:45:50 -0000       3.34
+++ test/Billard/Billard.cc     3 Jun 2008 14:16:22 -0000       3.35
@@ -243,7 +243,6 @@
                 rtiamb.queryFederateTime(localTime);
 
                 try {
-std::cout<<"BILLARD"<<std::endl;
                     rtiamb.enableTimeRegulation(localTime, TIME_STEP);
                     regulating = true ;
                     break ;
@@ -674,6 +673,7 @@
             }
     }
     catch (RTI::Exception& e) {
+        std::cout<<"sendInteraction raise exception 
"<<e._name<<"("<<e._reason<<")"<<std::endl;
         D.Out(pdExcept, "**** Exception sending interaction : %d", &e);
     }