From 1f702f1eb1dc3384797f4e6dc0a64e18797b375b Mon Sep 17 00:00:00 2001 From: zzz Date: Sun, 13 Feb 2011 20:28:46 +0000 Subject: [PATCH] * JobQueue: Prevet NPE at shutdown (thanks liberty) --- router/java/src/net/i2p/router/JobQueue.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/router/java/src/net/i2p/router/JobQueue.java b/router/java/src/net/i2p/router/JobQueue.java index 86c050b08..70a1b3bfe 100644 --- a/router/java/src/net/i2p/router/JobQueue.java +++ b/router/java/src/net/i2p/router/JobQueue.java @@ -227,10 +227,14 @@ public class JobQueue { } public long getMaxLag() { + // first job is the one that has been waiting the longest Job j = _readyJobs.peek(); if (j == null) return 0; - // first job is the one that has been waiting the longest - long startAfter = j.getTiming().getStartAfter(); + JobTiming jt = j.getTiming(); + // PoisonJob timing is null, prevent NPE at shutdown + if (jt == null) + return 0; + long startAfter = jt.getStartAfter(); return _context.clock().now() - startAfter; }