plugin cleanups

apps/routerconsole/java/src/net/i2p/router/web/PluginStarter.java

@@ -445,7 +445,8 @@ public class PluginStarter implements Runnable {
                     break;
                 }
 
-        log.debug("plugin name = <" + pluginName + ">; threads running? " + isClientThreadRunning(pluginName) + "; webapp runing? " + WebAppStarter.isWebAppRunning(pluginName) + "; jobs running? " + isJobRunning);
+        if (log.shouldLog(Log.DEBUG))
+            log.debug("plugin name = <" + pluginName + ">; threads running? " + isClientThreadRunning(pluginName) + "; webapp runing? " + WebAppStarter.isWebAppRunning(pluginName) + "; jobs running? " + isJobRunning);
         return isClientThreadRunning(pluginName) || WebAppStarter.isWebAppRunning(pluginName) || isJobRunning;
     }
     

apps/routerconsole/java/src/net/i2p/router/web/WebAppStarter.java

@@ -89,6 +89,8 @@ public class WebAppStarter {
 
     static boolean isWebAppRunning(String appName) {
         Server server = WebAppStarter.getConsoleServer();
+        if (server == null)
+            return false;
         // this will return a new context if one does not exist
         HttpContext wac = server.getContext('/' + appName);
         return wac.isStarted();

history.txt

@@ -1,6 +1,9 @@
+2010-04-23 zzz
+    * Plugins: Cleanups
+
 2010-04-21 zzz
     * EepGet: Don't convert a MalformedURLException into
-      an IOE so we recognize it when it's throuwn
+      an IOE so we recognize it when it's thrown
     * ReusableGZIPStreams:
       - Concurrent
       - Workaround for Apache Harmony 5.0M13 Deflater bug

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 = 15;
+    public final static long BUILD = 16;
 
     /** for example "-test" */
     public final static String EXTRA = "-rc";

router/java/src/net/i2p/router/startup/LoadClientAppsJob.java

@@ -4,7 +4,6 @@ import java.lang.reflect.Method;
 import java.util.Arrays;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.concurrent.CountDownLatch;
 
 import net.i2p.router.JobImpl;
 import net.i2p.router.RouterContext;