Update of /cvsroot/freenet/freenet/src/freenet
In directory sc8-pr-cvs1:/tmp/cvs-serv23419/src/freenet
Modified Files:
Tag: ngrouting
Ticker.java Version.java
Log Message:
logging. but mostly, fix a MAJOR thinko in discard sort ordering.
Index: Ticker.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/Ticker.java,v
retrieving revision 1.17
retrieving revision 1.17.2.1
diff -u -r1.17 -r1.17.2.1
--- Ticker.java 23 Jul 2003 14:44:37 -0000 1.17
+++ Ticker.java 26 Aug 2003 23:08:21 -0000 1.17.2.1
@@ -115,10 +115,16 @@
synchronized (this) {
if(logDEBUG) timeLog("Synchronized in Ticker loop");
// prepare ready events for immediate execution
+ int count=0;
while (events.size() > 0 &&
((Event) events.top()).time() <= System.currentTimeMillis()) {
if(logDEBUG) timeLog("Popping events from
Ticker loop");
Event e = (Event) events.pop();
+ if(logDEBUG) {
+ Core.logger.log(this, "Popped event
"+count+": "+e,
+
Logger.DEBUG);
+ count++;
+ }
jobs.addElement(e);
}
if(logDEBUG) timeLog("No more events");
Index: Version.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/Version.java,v
retrieving revision 1.307.2.34
retrieving revision 1.307.2.35
diff -u -r1.307.2.34 -r1.307.2.35
--- Version.java 26 Aug 2003 21:31:44 -0000 1.307.2.34
+++ Version.java 26 Aug 2003 23:08:21 -0000 1.307.2.35
@@ -18,7 +18,7 @@
public static String protocolVersion = "1.46";
/** The build number of the current revision */
- public static final int buildNumber = 7033;
+ public static final int buildNumber = 7035;
// 6028: may 3; ARK retrieval fix
public static final int ignoreBuildsAfter = 6500;
_______________________________________________
cvs mailing list
[EMAIL PROTECTED]
http://dodo.freenetproject.org/cgi-bin/mailman/listinfo/cvs
