[certi-cvs] certi/RTIA TimeManagement.cc

[certi-cvs]

CVSROOT:        /sources/certi
Module name:    certi
Changes by:     Eric NOULARD <erk>      09/06/04 11:31:51

Modified files:
        RTIA           : TimeManagement.cc 

Log message:
        Fix bug #25497
        After small discussion with Pierre and some rough testing
        we would say that TAR, TARA, NER, NERA may not
        be "timestamp" event like UAV or SI thus we can advance
        in time "below the lookahead" but after current time. 

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

Patches:
Index: TimeManagement.cc
===================================================================
RCS file: /sources/certi/certi/RTIA/TimeManagement.cc,v
retrieving revision 3.48
retrieving revision 3.49
diff -u -b -r3.48 -r3.49
--- TimeManagement.cc   21 Apr 2009 13:54:02 -0000      3.48
+++ TimeManagement.cc   4 Jun 2009 11:31:50 -0000       3.49
@@ -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.48 2009/04/21 13:54:02 siron Exp $
+// $Id: TimeManagement.cc,v 3.49 2009/06/04 11:31:50 erk Exp $
 // ----------------------------------------------------------------------------
 
 #include <config.h>
@@ -496,8 +496,9 @@
     if (heure_logique < _heure_courante)
         e = e_FederationTimeAlreadyPassed ;
 
-    if (heure_logique < _heure_courante + _lookahead_courant)
-       e = e_InvalidFederationTime ;
+// Fix bug #25497
+//    if (heure_logique < _heure_courante + _lookahead_courant)
+//       e = e_InvalidFederationTime ;
 
     if (e == e_NO_EXCEPTION) {
 
@@ -532,8 +533,9 @@
     if (heure_logique < _heure_courante)
         e = e_FederationTimeAlreadyPassed ;
 
-    if (heure_logique < _heure_courante + _lookahead_courant)
-       e = e_InvalidFederationTime ;
+// Fix bug #25497
+//    if (heure_logique < _heure_courante + _lookahead_courant)
+//       e = e_InvalidFederationTime ;
 
     if (e == e_NO_EXCEPTION) {
         _type_granted_state = AFTER_TARA_OR_NERA ;  // will be
@@ -920,12 +922,13 @@
     if (logical_time < _heure_courante)
         e = e_FederationTimeAlreadyPassed ;
 
-    if (logical_time < _heure_courante + _lookahead_courant) {
-
-    D.Out(pdDebug,"InvalidFederation time lkahead=%f, current=%f, 
requested=%f",
-                       
_lookahead_courant.getTime(),_heure_courante.getTime(),logical_time.getTime());
-       e = e_InvalidFederationTime ;
-    }
+// Fix bug #25497
+//    if (logical_time < _heure_courante + _lookahead_courant) {
+//
+//    D.Out(pdDebug,"InvalidFederation time lkahead=%f, current=%f, 
requested=%f",
+//                     
_lookahead_courant.getTime(),_heure_courante.getTime(),logical_time.getTime());
+//       e = e_InvalidFederationTime ;
+//    }
 
     if (e == e_NO_EXCEPTION) {
 
@@ -965,8 +968,9 @@
     if (logical_time < _heure_courante)
         e = e_FederationTimeAlreadyPassed ;
 
-    if (logical_time < _heure_courante + _lookahead_courant)
-       e = e_InvalidFederationTime ;
+//  Fix bug #25497
+//    if (logical_time < _heure_courante + _lookahead_courant)
+//       e = e_InvalidFederationTime ;
 
     if (e == e_NO_EXCEPTION) {
 
@@ -989,4 +993,4 @@
 
 }} // namespaces
 
-// $Id: TimeManagement.cc,v 3.48 2009/04/21 13:54:02 siron Exp $
+// $Id: TimeManagement.cc,v 3.49 2009/06/04 11:31:50 erk Exp $