merge of '1e0d390eeacce432f968251f1bbbe03ef031a116'

     and 'f61d617d9bfd5759366102b0b5ff45effde08e84'

core/java/src/net/i2p/data/Hash.java

@@ -104,4 +104,11 @@ public class Hash extends SimpleDataStructure {
         }
         return _base64ed;
     }
+
+    /**
+     *  @since 0.9.17
+     */
+    public static void clearCache() {
+        _cache.clear();
+    }
 }

core/java/src/net/i2p/data/PublicKey.java

@@ -68,4 +68,11 @@ public class PublicKey extends SimpleDataStructure {
     public int length() {
         return KEYSIZE_BYTES;
     }
+
+    /**
+     *  @since 0.9.17
+     */
+    public static void clearCache() {
+        _cache.clear();
+    }
 }

core/java/src/net/i2p/data/SDSCache.java

@@ -91,9 +91,16 @@ public class SDSCache<V extends SimpleDataStructure> {
      */
     private class Shutdown implements Runnable {
         public void run() {
-            synchronized(_cache) {
-                _cache.clear();
-            }
+            clear();
+        }
+    }
+
+    /**
+     * @since 0.9.17
+     */
+    public void clear() {
+        synchronized(_cache) {
+            _cache.clear();
         }
     }
 

core/java/src/net/i2p/data/SigningPublicKey.java

@@ -193,4 +193,11 @@ public class SigningPublicKey extends SimpleDataStructure {
         buf.append(']');
         return buf.toString();
     }
+
+    /**
+     *  @since 0.9.17
+     */
+    public static void clearCache() {
+        _cache.clear();
+    }
 }

history.txt

 2014-11-12 zzz
+ * Data: Clear more caches when under memory pressure and at shutdown
  * Plugins: Fix bug in stopping a ClientApp plugin with $parameters in the args
 2014-11-09 zzz

router/java/src/net/i2p/router/Router.java

@@ -25,14 +25,18 @@ import java.util.concurrent.ConcurrentHashMap;
 
 import gnu.getopt.Getopt;
 
+import net.i2p.crypto.SigUtil;
 import net.i2p.data.Base64;
 import net.i2p.data.Certificate;
 import net.i2p.data.DataFormatException;
 import net.i2p.data.DataHelper;
 import net.i2p.data.Destination;
-import net.i2p.data.router.RouterInfo;
+import net.i2p.data.Hash;
+import net.i2p.data.PublicKey;
 import net.i2p.data.SigningPrivateKey;
+import net.i2p.data.SigningPublicKey;
 import net.i2p.data.i2np.GarlicMessage;
+import net.i2p.data.router.RouterInfo;
 import net.i2p.router.message.GarlicMessageHandler;
 import net.i2p.router.networkdb.kademlia.FloodfillNetworkDatabaseFacade;
 import net.i2p.router.startup.CreateRouterInfoJob;
@@ -346,6 +350,10 @@ public class Router implements RouterClock.ClockShiftListener {
         SimpleByteCache.clearAll();
         Destination.clearCache();
         Translate.clearCache();
+        Hash.clearCache();
+        PublicKey.clearCache();
+        SigningPublicKey.clearCache();
+        SigUtil.clearCaches();
     }
 
     /**