From 7c8f519b35d80f342ce05ec1248ba97b627ac0ed Mon Sep 17 00:00:00 2001
From: zzz <zzz>
Date: Sat, 29 Dec 2007 23:59:24 +0000
Subject: [PATCH] 2007-12-29 zzz     * Allow commas in router.trustedUpdateKeys
 and router.updateURL again

---
 .../java/src/net/i2p/router/web/UpdateHandler.java            | 2 +-
 core/java/src/net/i2p/crypto/TrustedUpdate.java               | 2 +-
 history.txt                                                   | 3 ++-
 router/java/src/net/i2p/router/RouterVersion.java             | 4 ++--
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/apps/routerconsole/java/src/net/i2p/router/web/UpdateHandler.java b/apps/routerconsole/java/src/net/i2p/router/web/UpdateHandler.java
index 0b71364e4..3f0a9bed8 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/UpdateHandler.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/UpdateHandler.java
@@ -184,7 +184,7 @@ public class UpdateHandler {
 
     private String selectUpdateURL() {
         String URLs = _context.getProperty(ConfigUpdateHandler.PROP_UPDATE_URL, ConfigUpdateHandler.DEFAULT_UPDATE_URL);
-        StringTokenizer tok = new StringTokenizer(URLs, "\r\n");
+        StringTokenizer tok = new StringTokenizer(URLs, " ,\r\n");
         List URLList = new ArrayList();
         while (tok.hasMoreTokens())
             URLList.add(tok.nextToken().trim());
diff --git a/core/java/src/net/i2p/crypto/TrustedUpdate.java b/core/java/src/net/i2p/crypto/TrustedUpdate.java
index e28bb0473..bb50af131 100644
--- a/core/java/src/net/i2p/crypto/TrustedUpdate.java
+++ b/core/java/src/net/i2p/crypto/TrustedUpdate.java
@@ -98,7 +98,7 @@ jP69nPbh4KLGhF+SD0+0bW4=
         String propertyTrustedKeys = context.getProperty(PROP_TRUSTED_KEYS);
 
         if ( (propertyTrustedKeys != null) && (propertyTrustedKeys.length() > 0) ) {
-            StringTokenizer propertyTrustedKeysTokens = new StringTokenizer(propertyTrustedKeys, "\r\n");
+            StringTokenizer propertyTrustedKeysTokens = new StringTokenizer(propertyTrustedKeys, " ,\r\n");
 
             while (propertyTrustedKeysTokens.hasMoreTokens())
                 _trustedKeys.add(propertyTrustedKeysTokens.nextToken().trim());
diff --git a/history.txt b/history.txt
index d5ec73f9e..7e28cc70b 100644
--- a/history.txt
+++ b/history.txt
@@ -1,6 +1,7 @@
-$Id: history.txt,v 1.606 2007-12-29 16:08:31 zzz Exp $
+$Id: history.txt,v 1.607 2007-12-29 17:15:14 zzz Exp $
 
 2007-12-29 zzz
+    * Allow commas in router.trustedUpdateKeys and router.updateURL again
     * Change default news host from dev.i2p.net to dev.i2p
     * Change jetty timeout from 30 to 60 sec (thanks sponge!)
 
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index be57eab30..e8e10890a 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.541 $ $Date: 2007-12-29 16:08:29 $";
+    public final static String ID = "$Revision: 1.542 $ $Date: 2007-12-29 17:15:11 $";
     public final static String VERSION = "0.6.1.30";
-    public final static long BUILD = 13;
+    public final static long BUILD = 14;
     public static void main(String args[]) {
         System.out.println("I2P Router version: " + VERSION + "-" + BUILD);
         System.out.println("Router ID: " + RouterVersion.ID);