From d8e297dde71728a3d5567c1c3a3a7a72192e2007 Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Mon, 2 Jan 2012 12:31:23 +0000
Subject: [PATCH]  * Fix webapp PortMapper lookup for SSL-only console

---
 .../java/src/net/i2p/router/web/WebAppStarter.java          | 6 +++++-
 core/java/src/net/i2p/util/PortMapper.java                  | 2 --
 history.txt                                                 | 4 ++++
 router/java/src/net/i2p/router/RouterVersion.java           | 2 +-
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/apps/routerconsole/java/src/net/i2p/router/web/WebAppStarter.java b/apps/routerconsole/java/src/net/i2p/router/web/WebAppStarter.java
index 9c47190c1..95fe51d8a 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/WebAppStarter.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/WebAppStarter.java
@@ -137,12 +137,16 @@ public class WebAppStarter {
     
     /** see comments in ConfigClientsHandler */
     static Server getConsoleServer() {
+        PortMapper pm = I2PAppContext.getGlobalContext().portMapper();
+        int p1 = pm.getPort(PortMapper.SVC_CONSOLE);
+        int p2 = pm.getPort(PortMapper.SVC_HTTPS_CONSOLE);
         Collection c = Server.getHttpServers();
         for (int i = 0; i < c.size(); i++) {
             Server s = (Server) c.toArray()[i];
             HttpListener[] hl = s.getListeners();
             for (int j = 0; j < hl.length; j++) {
-                if (hl[j].getPort() == I2PAppContext.getGlobalContext().portMapper().getPort(PortMapper.SVC_CONSOLE))
+                int port = hl[j].getPort();
+                if (port == p1 || port == p2)
                     return s;
             }
         }
diff --git a/core/java/src/net/i2p/util/PortMapper.java b/core/java/src/net/i2p/util/PortMapper.java
index cb5d7317e..0efd58989 100644
--- a/core/java/src/net/i2p/util/PortMapper.java
+++ b/core/java/src/net/i2p/util/PortMapper.java
@@ -59,8 +59,6 @@ public class PortMapper {
      */
     public int getPort(String service) {
         int port = getPort(service, -1);
-        if(-1==port)
-            throw new RuntimeException("No port registered for service "+service);
         return port;
     }
 
diff --git a/history.txt b/history.txt
index 4901d88a9..09b0c5e3f 100644
--- a/history.txt
+++ b/history.txt
@@ -1,3 +1,7 @@
+2012-01-02 zzz
+ * Fix webapp PortMapper lookup for SSL-only console
+ * Wrapper 3.5.13 for arm v7
+
 2011-12-31 zzz
  * Fix log NPE when saveConfig() fails at startup, thx kytv
    (backport from jetty6 branch)
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index 0e04b1445..33006bcb1 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 = "Monotone";
     public final static String VERSION = CoreVersion.VERSION;
-    public final static long BUILD = 26;
+    public final static long BUILD = 27;
 
     /** for example "-test" */
     public final static String EXTRA = "-rc";