From 49b11e1f840f2708ee91349d392cf1bb8ab6bb33 Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Fri, 28 Sep 2012 18:48:16 +0000
Subject: [PATCH]  * Streaming: Don't send RST on globally-blackisted conns

---
 .../java/src/net/i2p/client/streaming/ConnectionManager.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/apps/streaming/java/src/net/i2p/client/streaming/ConnectionManager.java b/apps/streaming/java/src/net/i2p/client/streaming/ConnectionManager.java
index 5047a0454..7a9529e5e 100644
--- a/apps/streaming/java/src/net/i2p/client/streaming/ConnectionManager.java
+++ b/apps/streaming/java/src/net/i2p/client/streaming/ConnectionManager.java
@@ -240,6 +240,7 @@ class ConnectionManager {
                 Hash h = from.calculateHash();
                 if ((_hourThrottler != null && _hourThrottler.isThrottled(h)) ||
                     (_dayThrottler != null && _dayThrottler.isThrottled(h)) ||
+                    _globalBlacklist.contains(h) ||
                     (_defaultOptions.isAccessListEnabled() && !_defaultOptions.getAccessList().contains(h)) ||
                     (_defaultOptions.isBlacklistEnabled() && _defaultOptions.getBlacklist().contains(h))) {
                     // A signed RST packet + ElGamal + session tags is fairly expensive, so
@@ -435,7 +436,7 @@ class ConnectionManager {
         if (!_currentBlacklist.equals(hashes)) {
             // rebuild _globalBlacklist when property changes
             synchronized(_globalBlacklist) {
-                if (hashes != null) {
+                if (hashes.length() > 0) {
                     Set<Hash> newSet = new HashSet();
                     StringTokenizer tok = new StringTokenizer(hashes, ",; ");
                     while (tok.hasMoreTokens()) {