diff --git a/apps/routerconsole/java/src/net/i2p/router/web/JobQueueHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/JobQueueHelper.java
index edd612fe5c..723aaa739f 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/JobQueueHelper.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/JobQueueHelper.java
@@ -8,7 +8,6 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
-import java.util.TreeMap;
import net.i2p.data.DataHelper;
import net.i2p.router.Job;
@@ -76,15 +75,17 @@ public class JobQueueHelper extends HelperBase {
out.flush();
buf.append("
Scheduled jobs: ").append(timedJobs.size()).append("\n");
- TreeMap ordered = new TreeMap();
- for (int i = 0; i < timedJobs.size(); i++) {
- Job j = timedJobs.get(i);
- ordered.put(Long.valueOf(j.getTiming().getStartAfter()), j);
- }
- for (Job j : ordered.values()) {
+ long prev = Long.MIN_VALUE;
+ for (Job j : timedJobs) {
long time = j.getTiming().getStartAfter() - now;
buf.append("- ").append(j.getName()).append(" in ");
- buf.append(DataHelper.formatDuration2(time)).append("
\n");
+ buf.append(DataHelper.formatDuration2(time));
+ if (time < 0)
+ buf.append(" DELAYED");
+ if (time < prev)
+ buf.append(" ** OUT OF ORDER **");
+ prev = time;
+ buf.append("\n");
}
buf.append("
\n");
diff --git a/history.txt b/history.txt
index 0f0e252024..87e8e434b0 100644
--- a/history.txt
+++ b/history.txt
@@ -1,3 +1,11 @@
+2012-05-23 zzz
+ * i2psnark:
+ - Fixes when complete except for skipped files
+ (ticket #447) status in UI, don't connect outbound,
+ disconnect seeds when done
+ - More classes pkg private
+ * jobs.jsp: Add more queue diagnostics
+
2012-05-22 zzz
* i2psnark:
- Refactor tracker map
@@ -9,7 +17,7 @@
* Console: Add full file path to thread dump message
* i2psnark:
- Create sparse files at torrent creation and delay
- "ballooning" until first write (ticket #641)
+ "ballooning" until first write (ticket #641, #447)
- Redo clear messages button
- Concurrent message queue
* Profiles: reduce same-country bonus
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index f6e6df3a5c..4e28a2c8d2 100644
--- a/router/java/src/net/i2p/router/RouterVersion.java
+++ b/router/java/src/net/i2p/router/RouterVersion.java
@@ -18,7 +18,7 @@ public class RouterVersion {
/** deprecated */
public final static String ID = "Monotone";
public final static String VERSION = CoreVersion.VERSION;
- public final static long BUILD = 4;
+ public final static long BUILD = 5;
/** for example "-test" */
public final static String EXTRA = "";