From 7f2bd164db4ae0d7ff48a1b2337df9d217955a4e Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Sat, 16 Jul 2016 16:08:34 +0000
Subject: [PATCH] Plugins: Add exception for HSQLDB Timer in thread check

---
 .../java/src/net/i2p/router/web/PluginStarter.java          | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/apps/routerconsole/java/src/net/i2p/router/web/PluginStarter.java b/apps/routerconsole/java/src/net/i2p/router/web/PluginStarter.java
index 1d6c0fa21..4caffa3c2 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/PluginStarter.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/PluginStarter.java
@@ -911,6 +911,7 @@ public class PluginStarter implements Runnable {
         
         // Plugins start before the eepsite, and will create the static Timer thread
         // in RolloverFileOutputStream, which never stops. Don't count it.
+        // Ditto HSQLDB Timer (jwebcache)
         if (rv) {
             Log log = ctx.logManager().getLog(PluginStarter.class);
             Thread[] activeThreads = new Thread[128];
@@ -919,10 +920,11 @@ public class PluginStarter implements Runnable {
             for (int i = 0; i < count; i++) {
                 if (activeThreads[i] != null) {
                     String name = activeThreads[i].getName();
-                    if (!"org.eclipse.jetty.util.RolloverFileOutputStream".equals(name))
+                    if (!"org.eclipse.jetty.util.RolloverFileOutputStream".equals(name) &&
+                        !name.startsWith("HSQLDB Timer"))
                         notRollover = true;
                     if (log.shouldLog(Log.DEBUG))
-                        log.debug("Found " + activeThreads[i].getState() + " thread for " + pluginName + ": " + name);
+                        log.debug("Found " + activeThreads[i].getState() + " thread " + name + " for " + pluginName + ": " + name);
                 }
             }
             rv = notRollover;