From c3dc76e35fa71b5215d4cc72602a07e57619eca2 Mon Sep 17 00:00:00 2001 From: zzz Date: Sat, 12 Dec 2009 01:36:57 +0000 Subject: [PATCH] disable internal sockets until I can fix the borkenness --- core/java/src/net/i2p/util/InternalSocket.java | 10 +++++----- history.txt | 3 +++ router/java/src/net/i2p/router/RouterVersion.java | 2 +- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/core/java/src/net/i2p/util/InternalSocket.java b/core/java/src/net/i2p/util/InternalSocket.java index 26280f254..52b028c11 100644 --- a/core/java/src/net/i2p/util/InternalSocket.java +++ b/core/java/src/net/i2p/util/InternalSocket.java @@ -34,12 +34,12 @@ public class InternalSocket extends Socket { * Convenience method to return either a Socket or an InternalSocket */ public static Socket getSocket(String host, int port) throws IOException { - if (System.getProperty("router.version") != null && - (host.equals("127.0.0.1") || host.equals("localhost"))) { - return new InternalSocket(port); - } else { + //if (System.getProperty("router.version") != null && + // (host.equals("127.0.0.1") || host.equals("localhost"))) { + // return new InternalSocket(port); + //} else { return new Socket(host, port); - } + //} } @Override diff --git a/history.txt b/history.txt index dcf850ba3..aa9bf922b 100644 --- a/history.txt +++ b/history.txt @@ -1,3 +1,6 @@ +2009-12-12 zzz + * Disable InternalSockets until it's fixed + 2009-12-11 zzz * Addressbook, susidns: Rework addressbook into a HttpServlet, so susidns can kick it when the subscription diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index bd644cee5..ef84e9e97 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 = 2; + public final static long BUILD = 3; /** for example "-test" */ public final static String EXTRA = ""; public final static String FULL_VERSION = VERSION + "-" + BUILD + EXTRA;