[certi-cvs] certi libRTI/RTIambPrivateRefs.cc RTIG/RTIG_pro...

[certi-cvs]

CVSROOT:        /sources/certi
Module name:    certi
Changes by:     Eric NOULARD <erk>      10/08/10 08:45:47

Modified files:
        libRTI         : RTIambPrivateRefs.cc 
        RTIG           : RTIG_processing.cc Federation.cc 

Log message:
        Fix of bug 30349: RTIA (RTIA_network.cc) does not handle some message 
(NM_Register_Federation_Synchronization_Point) sent by RTIG.
        
        the first try was incomplete, this one should be better

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/certi/libRTI/RTIambPrivateRefs.cc?cvsroot=certi&r1=3.26&r2=3.27
http://cvs.savannah.gnu.org/viewcvs/certi/RTIG/RTIG_processing.cc?cvsroot=certi&r1=3.105&r2=3.106
http://cvs.savannah.gnu.org/viewcvs/certi/RTIG/Federation.cc?cvsroot=certi&r1=3.130&r2=3.131

Patches:
Index: libRTI/RTIambPrivateRefs.cc
===================================================================
RCS file: /sources/certi/certi/libRTI/RTIambPrivateRefs.cc,v
retrieving revision 3.26
retrieving revision 3.27
diff -u -b -r3.26 -r3.27
--- libRTI/RTIambPrivateRefs.cc 20 Mar 2010 16:34:14 -0000      3.26
+++ libRTI/RTIambPrivateRefs.cc 10 Aug 2010 08:45:46 -0000      3.27
@@ -19,7 +19,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 // USA
 //
-// $Id: RTIambPrivateRefs.cc,v 3.26 2010/03/20 16:34:14 erk Exp $
+// $Id: RTIambPrivateRefs.cc,v 3.27 2010/08/10 08:45:46 erk Exp $
 // ----------------------------------------------------------------------------
 
 #include <config.h>
@@ -635,6 +635,13 @@
                
CATCH_FEDERATE_AMBASSADOR_EXCEPTIONS("synchronizationPointRegistrationSucceeded")
                break ;
 
+       case Message::SYNCHRONIZATION_POINT_REGISTRATION_FAILED:
+               try {
+                       
fed_amb->synchronizationPointRegistrationFailed((msg->getLabel()).c_str());
+               }
+               
CATCH_FEDERATE_AMBASSADOR_EXCEPTIONS("synchronizationPointRegistrationFailed")
+               break ;
+
        case Message::ANNOUNCE_SYNCHRONIZATION_POINT:
                try {
                        
fed_amb->announceSynchronizationPoint((msg->getLabel()).c_str(),(msg->getTag()).c_str());
@@ -976,4 +983,4 @@
        }
 }
 
-// $Id: RTIambPrivateRefs.cc,v 3.26 2010/03/20 16:34:14 erk Exp $
+// $Id: RTIambPrivateRefs.cc,v 3.27 2010/08/10 08:45:46 erk Exp $

Index: RTIG/RTIG_processing.cc
===================================================================
RCS file: /sources/certi/certi/RTIG/RTIG_processing.cc,v
retrieving revision 3.105
retrieving revision 3.106
diff -u -b -r3.105 -r3.106
--- RTIG/RTIG_processing.cc     9 Aug 2010 18:24:07 -0000       3.105
+++ RTIG/RTIG_processing.cc     10 Aug 2010 08:45:46 -0000      3.106
@@ -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.105 2010/08/09 18:24:07 erk Exp $
+// $Id: RTIG_processing.cc,v 3.106 2010/08/10 08:45:46 erk Exp $
 // ----------------------------------------------------------------------------
 
 #include <config.h>
@@ -575,9 +575,10 @@
     }
     // send synchronizationPointRegistrationSucceeded() to federate.
     rep.setSuccessIndicator(true);
-  } catch (RTIinternalError &e) {
+  } catch (Exception &e) {
     /* the registration did fail */
     rep.setSuccessIndicator(false);
+    rep.setFailureReason(std::string(e._name) + ":" + std::string(e._reason));
   }
   D.Out(pdTerm, "Federation %u is now synchronizing.", req->getFederation());
 
@@ -1529,4 +1530,4 @@
 
 }} // namespace certi/rtig
 
-// $Id: RTIG_processing.cc,v 3.105 2010/08/09 18:24:07 erk Exp $
+// $Id: RTIG_processing.cc,v 3.106 2010/08/10 08:45:46 erk Exp $

Index: RTIG/Federation.cc
===================================================================
RCS file: /sources/certi/certi/RTIG/Federation.cc,v
retrieving revision 3.130
retrieving revision 3.131
diff -u -b -r3.130 -r3.131
--- RTIG/Federation.cc  9 Aug 2010 18:24:07 -0000       3.130
+++ RTIG/Federation.cc  10 Aug 2010 08:45:46 -0000      3.131
@@ -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: Federation.cc,v 3.130 2010/08/09 18:24:07 erk Exp $
+// $Id: Federation.cc,v 3.131 2010/08/10 08:45:46 erk Exp $
 // ----------------------------------------------------------------------------
 
 #include <config.h>
@@ -1004,7 +1004,7 @@
        // Verify label does not already exists
        std::map<std::string, std::string>::const_iterator i = 
synchronizationLabels.find(label);
        if (i != synchronizationLabels.end()) {
-               throw FederationAlreadyPaused(""); // Label already pending.
+               throw FederationAlreadyPaused("Label already pending"); // 
Label already pending.
        }
 
        // If not already in pending labels, insert to list.
@@ -2616,5 +2616,5 @@
 
 }} // namespace certi/rtig
 
-// $Id: Federation.cc,v 3.130 2010/08/09 18:24:07 erk Exp $
+// $Id: Federation.cc,v 3.131 2010/08/10 08:45:46 erk Exp $