i2psnark:

- Use new I2PAppThread that does not call global listeners on OOM,
      so that OOMing apps will not shutdown the whole router.

core/java/src/net/i2p/util/I2PAppThread.java

@@ -0,0 +1,62 @@
+package net.i2p.util;
+
+/*
+ * free (adj.): unencumbered; not under the control of others
+ * Written by jrandom in 2003 and released into the public domain 
+ * with no warranty of any kind, either expressed or implied.  
+ * It probably won't make your computer catch on fire, or eat 
+ * your children, but it might.  Use at your own risk.
+ *
+ */
+
+
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Set;
+
+/**
+ * Like I2PThread but with per-thread OOM listeners,
+ * rather than a static router-wide listener list,
+ * so that an OOM in an app won't call the router listener
+ * to shutdown the whole router.
+ */
+public class I2PAppThread extends I2PThread {
+
+    private Set _threadListeners = new HashSet(0);
+
+    public I2PAppThread() {
+        super();
+    }
+
+    public I2PAppThread(String name) {
+        super(name);
+    }
+
+    public I2PAppThread(Runnable r) {
+        super(r);
+    }
+
+    public I2PAppThread(Runnable r, String name) {
+        super(r, name);
+    }
+    public I2PAppThread(Runnable r, String name, boolean isDaemon) {
+        super(r, name);
+    }
+    
+    protected void fireOOM(OutOfMemoryError oom) {
+        for (Iterator iter = _threadListeners.iterator(); iter.hasNext(); ) {
+            OOMEventListener listener = (OOMEventListener)iter.next();
+            listener.outOfMemory(oom);
+        }
+    }
+
+    /** register a new component that wants notification of OOM events */
+    public void addOOMEventThreadListener(OOMEventListener lsnr) {
+        _threadListeners.add(lsnr);
+    }
+
+    /** unregister a component that wants notification of OOM events */    
+    public void removeOOMEventThreadListener(OOMEventListener lsnr) {
+        _threadListeners.remove(lsnr);
+    }
+}

core/java/src/net/i2p/util/I2PThread.java

@@ -88,7 +88,7 @@ public class I2PThread extends Thread {
         super.finalize();
     }
     
-    private void fireOOM(OutOfMemoryError oom) {
+    protected void fireOOM(OutOfMemoryError oom) {
         for (Iterator iter = _listeners.iterator(); iter.hasNext(); ) {
             OOMEventListener listener = (OOMEventListener)iter.next();
             listener.outOfMemory(oom);