diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHelper.java index 5c9015dee..17cadb94d 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHelper.java @@ -50,8 +50,16 @@ public class ConfigNetHelper { } public final static String PROP_I2NP_NTCP_HOSTNAME = "i2np.ntcp.hostname"; public final static String PROP_I2NP_NTCP_PORT = "i2np.ntcp.port"; - public String getNtcphostname() { return _context.getProperty(PROP_I2NP_NTCP_HOSTNAME); } - public String getNtcpport() { return _context.getProperty(PROP_I2NP_NTCP_PORT); } + public String getNtcphostname() { + String hostname = _context.getProperty(PROP_I2NP_NTCP_HOSTNAME); + if (hostname == null) return ""; + return hostname; + } + public String getNtcpport() { + String port = _context.getProperty(PROP_I2NP_NTCP_PORT); + if (port == null) return ""; + return port; + } public String getUdpAddress() { RouterAddress addr = _context.router().getRouterInfo().getTargetAddress("SSU"); diff --git a/apps/routerconsole/jsp/summary.jsp b/apps/routerconsole/jsp/summary.jsp index 40bdc8269..0c6fc18c9 100644 --- a/apps/routerconsole/jsp/summary.jsp +++ b/apps/routerconsole/jsp/summary.jsp @@ -13,8 +13,8 @@ Ident:
Version:
Uptime:
- Now:
- Status: <% + Now: <% if (helper.updateAvailable()) { if ("true".equals(System.getProperty("net.i2p.router.web.UpdateHandler.updateInProgress", "false"))) { out.print("
" + update.getStatus()); diff --git a/core/java/src/net/i2p/CoreVersion.java b/core/java/src/net/i2p/CoreVersion.java index f0297a21c..e6ff3452a 100644 --- a/core/java/src/net/i2p/CoreVersion.java +++ b/core/java/src/net/i2p/CoreVersion.java @@ -14,8 +14,8 @@ package net.i2p; * */ public class CoreVersion { - public final static String ID = "$Revision: 1.67 $ $Date: 2006-07-29 13:03:19 $"; - public final static String VERSION = "0.6.1.25"; + public final static String ID = "$Revision: 1.8 $ $Date: 2006-09-09 12:46:25 $"; + public final static String VERSION = "0.6.1.26"; public static void main(String args[]) { System.out.println("I2P Core version: " + VERSION); diff --git a/history.txt b/history.txt index a628e3668..6378d6e03 100644 --- a/history.txt +++ b/history.txt @@ -1,4 +1,10 @@ -$Id: history.txt,v 1.530 2006-09-29 18:54:19 zzz Exp $ +$Id: history.txt,v 1.531 2006-10-08 17:52:59 complication Exp $ + +* 2006-10-10 0.6.1.26 released + +2006-10-10 jrandom + * Removed the status display from the console, as its more confusing + than informative (though the content is still displayed in the HTML) 2006-10-08 Complication * Add a framed average peer clock skew calculator diff --git a/installer/install.xml b/installer/install.xml index 89e494c0b..7ea1edee0 100644 --- a/installer/install.xml +++ b/installer/install.xml @@ -4,7 +4,7 @@ i2p - 0.6.1.25 + 0.6.1.26 diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index b02c2d3e9..e1673adb4 100644 --- a/router/java/src/net/i2p/router/RouterVersion.java +++ b/router/java/src/net/i2p/router/RouterVersion.java @@ -15,9 +15,9 @@ import net.i2p.CoreVersion; * */ public class RouterVersion { - public final static String ID = "$Revision: 1.465 $ $Date: 2006-09-29 18:54:17 $"; - public final static String VERSION = "0.6.1.25"; - public final static long BUILD = 12; + public final static String ID = "$Revision: 1.466 $ $Date: 2006-10-08 17:53:00 $"; + public final static String VERSION = "0.6.1.26"; + public final static long BUILD = 0; public static void main(String args[]) { System.out.println("I2P Router version: " + VERSION + "-" + BUILD); System.out.println("Router ID: " + RouterVersion.ID);