From c2edd7e926fddfeefe6ec78ee780b212aa843ef2 Mon Sep 17 00:00:00 2001
From: zzz <zzz@i2pmail.org>
Date: Fri, 17 Jun 2022 12:52:36 -0400
Subject: [PATCH] SusiDNS: Fix classloading on Java 11+

Caused SusiDNS and addressbook to be in a different context
addressbook config would be stored in base dir
and subscriptions would not load because it couldn't find i2ptunnel
---
 .../java/src/net/i2p/router/web/WebAppConfiguration.java  | 2 ++
 history.txt                                               | 8 ++++++++
 router/java/src/net/i2p/router/RouterVersion.java         | 2 +-
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/apps/routerconsole/java/src/net/i2p/router/web/WebAppConfiguration.java b/apps/routerconsole/java/src/net/i2p/router/web/WebAppConfiguration.java
index 553bf9817..f61ab242c 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/WebAppConfiguration.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/WebAppConfiguration.java
@@ -106,6 +106,8 @@ public class WebAppConfiguration implements Configuration {
         if (ctxPath.equals("/susidns")) {
             // Old installs don't have this in their wrapper.config classpath
             cp = "addressbook.jar";
+            // Java 11+ fix to prevent dup contexts
+            wac.setParentLoaderPriority(true);
         } else if (pluginDir.exists()) {
             File consoleDir = new File(pluginDir, "console");
             Properties props = RouterConsoleRunner.webAppProperties(consoleDir.getAbsolutePath());
diff --git a/history.txt b/history.txt
index 9d4292a0f..9686864f8 100644
--- a/history.txt
+++ b/history.txt
@@ -1,3 +1,11 @@
+2022-06-17 zzz
+ * Crypto: Fix equality checking of ECParameterSpecs
+ * SusiDNS: Fix classloading on Java 11+
+ * Util: ArraySet improvements, prep for use
+
+2022-06-16 zzz
+ * SSU2: Hole punch processing and fixes
+
 2022-06-14 zzz
  * SSU2:
    - Add per-introducer relay state machine
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index f2424bd3b..707cdcd34 100644
--- a/router/java/src/net/i2p/router/RouterVersion.java
+++ b/router/java/src/net/i2p/router/RouterVersion.java
@@ -18,7 +18,7 @@ public class RouterVersion {
     /** deprecated */
     public final static String ID = "Git";
     public final static String VERSION = CoreVersion.VERSION;
-    public final static long BUILD = 6;
+    public final static long BUILD = 7;
 
     /** for example "-test" */
     public final static String EXTRA = "";