certi/RTIA TimeManagement.cc

[certi-cvs]

CVSROOT:        /sources/certi
Module name:    certi
Changes by:     Pierre Siron <siron>    07/11/27 14:39:49

Modified files:
        RTIA           : TimeManagement.cc 

Log message:
        The asynchronous delivery should affect only the behavior
        of constrained federates.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/certi/RTIA/TimeManagement.cc?cvsroot=certi&r1=3.22&r2=3.23

Patches:
Index: TimeManagement.cc
===================================================================
RCS file: /sources/certi/certi/RTIA/TimeManagement.cc,v
retrieving revision 3.22
retrieving revision 3.23
diff -u -b -r3.22 -r3.23
--- TimeManagement.cc   12 Nov 2007 14:49:10 -0000      3.22
+++ TimeManagement.cc   27 Nov 2007 14:39:49 -0000      3.23
@@ -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: TimeManagement.cc,v 3.22 2007/11/12 14:49:10 siron Exp $
+// $Id: TimeManagement.cc,v 3.23 2007/11/27 14:39:49 siron Exp $
 // ----------------------------------------------------------------------------
 
 #include <config.h>
@@ -599,9 +599,9 @@
 
     // 2nd try, give a FIFO message. (discoverObject, etc.)
     if (!msg_donne)
-        if ( _asynchronous_delivery || (_avancee_en_cours != PAS_D_AVANCEE))
+        if ( _asynchronous_delivery || (_avancee_en_cours != PAS_D_AVANCEE) || 
(! _est_contraint))
           // to exclude the case not asynchronous_delivery and
-          // not time advancing
+          // not time advancing for a constrained federate
           msg = queues->giveFifoMessage(msg_donne, msg_restant);
 
     // If message exists, send it to federate.
@@ -747,4 +747,4 @@
 
 }} // namespaces
 
-// $Id: TimeManagement.cc,v 3.22 2007/11/12 14:49:10 siron Exp $
+// $Id: TimeManagement.cc,v 3.23 2007/11/27 14:39:49 siron Exp $