Update of /cvsroot/freenet/freenet/src/freenet/node/states/request
In directory sc8-pr-cvs1:/tmp/cvs-serv18983
Modified Files:
Pending.java
Log Message:
Got rid of expression 1000*1000*1000*1000 which was supposed
to be 2001-09-09 01:46:40 UTC in milliseconds, but which
actually is equal to 3567587328, or 1970-02-11 06:59:47.328 UTC
Also got rid of the 1000L*... (in the one place where it
mattered, it was fixed) since the comparison was redundant.
Index: Pending.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/states/request/Pending.java,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- Pending.java 11 Oct 2003 01:02:11 -0000 1.69
+++ Pending.java 13 Oct 2003 11:05:11 -0000 1.70
@@ -61,6 +61,12 @@
SendFinished outwardSender = null;
Identity outwardIdentityLastUsed = null;
+ // date --utc --date '1970-01-01 UTC 978307199 seconds' '+%F %H:%M:%S UTC'
+ // 2000-12-31 23:59:59 UTC
+ // date --utc --date '2000-12-31 23:59:59 UTC' +%s
+ // 978307199
+ private final long last20thCenturyMillisecond = 978307199999L;
+
public String toString() {
return super.toString()+", routedTime="+routedTime+", replyTime="+replyTime+",
outwardSender="+outwardSender;
}
@@ -153,10 +159,10 @@
if(logDEBUG) n.logger.log(this, "Remeasured receivedTime: "+receivedTime+
" for "+this, Logger.DEBUG);
}
- if (receivedTime < 1000*1000*1000*1000) {
+ if (receivedTime <= last20thCenturyMillisecond) {
if(logDEBUG && receivedTime > -1)
- n.logger.log(this, "qr.getReceivedTime() returned time way "+
- "before the present ("+receivedTime+") for "+
+ n.logger.log(this, "qr.getReceivedTime() returned a 20th century time
"+
+ receivedTime + ") for " +
this, Logger.DEBUG);
receivedTime = 0;
} else {
@@ -235,13 +241,12 @@
// message receive time or the
// scheduled restart time.
}
- if (receivedTime < 1000*1000*1000*1000) {
+ if (receivedTime <= last20thCenturyMillisecond) {
if(logDEBUG)
- n.logger.log(this, "ri.startTime() returned time way before the "+
- "present for "+this, Logger.DEBUG);
+ n.logger.log(this, "ri.startTime() returned a 20th century time "+
+ + this, Logger.DEBUG);
receivedTime = 0;
- }
- if (receivedTime > 1000L*1000L*1000L*1000L) {
+ } else {
long x = gotTime - receivedTime;
n.diagnostics.occurrenceContinuous("preRoutingTime", x);
if(x > 500 && logDEBUG)
_______________________________________________
cvs mailing list
[EMAIL PROTECTED]
http://dodo.freenetproject.org/cgi-bin/mailman/listinfo/cvs
