From f0f363e8c302612ce89d346d06788e6911eab76f Mon Sep 17 00:00:00 2001 From: zzz Date: Sun, 27 Oct 2013 17:09:29 +0000 Subject: [PATCH] * Streaming: Fix instantiation failure with blacklist entries, caused by bad fix for ticket #1070 --- .../java/src/net/i2p/client/streaming/ConnectionOptions.java | 2 +- history.txt | 5 ++++- router/java/src/net/i2p/router/RouterVersion.java | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/apps/streaming/java/src/net/i2p/client/streaming/ConnectionOptions.java b/apps/streaming/java/src/net/i2p/client/streaming/ConnectionOptions.java index e2336e19b..9f2c5d5df 100644 --- a/apps/streaming/java/src/net/i2p/client/streaming/ConnectionOptions.java +++ b/apps/streaming/java/src/net/i2p/client/streaming/ConnectionOptions.java @@ -784,7 +784,7 @@ class ConnectionOptions extends I2PSocketOptionsImpl { Hash h = ConvertToHash.getHash(hashstr); if (h == null) error("bad list hash: " + hashstr); - else if (_blackListEnabled) + else if (blackListEnabled) blackList.add(h); else accessList.add(h); diff --git a/history.txt b/history.txt index 289ee0e16..517f0da6d 100644 --- a/history.txt +++ b/history.txt @@ -1,3 +1,6 @@ +2013-10-27 zzz + * Streaming; Fix crash caused by previous blacklist fix (ticket #1070) + 2013-10-26 zzz * i2psnark: Display base name, not torrent file name (ticket #985) * I2PTunnel HTTP server: New POST limiter @@ -83,7 +86,7 @@ * Logging: - Require strict match of class name component - parseLimits() cleanup - * SSU: More efficient ImboundMessageState + * SSU: More efficient InboundMessageState * Streaming: - Fix active stream counting so it doesn't count streams that are closed and in TIME-WAIT state. Also, break out of the diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index e36cd3b14..7f4edb975 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 = 12; + public final static long BUILD = 13; /** for example "-test" */ public final static String EXTRA = "";