From a020697d641db504e8b409182f41ce211b9e3e7a Mon Sep 17 00:00:00 2001
From: Felix Ableitner <felixableitner@gmail.com>
Date: Thu, 11 Jul 2013 13:10:23 +0200
Subject: [PATCH] Fixed problems with blacklist entry insertion.

---
 htroot/Blacklist_p.java | 35 +++++++++++++++--------------------
 1 file changed, 15 insertions(+), 20 deletions(-)

diff --git a/htroot/Blacklist_p.java b/htroot/Blacklist_p.java
index d7261127e..1fd019653 100644
--- a/htroot/Blacklist_p.java
+++ b/htroot/Blacklist_p.java
@@ -547,19 +547,17 @@ public class Blacklist_p {
         if (pos > 0) {
             path = oldEntry.substring(pos + 1);
         }
-        if (Switchboard.urlBlacklist.getFileName(BlacklistType.DHT) == blacklistToUse) {
-        	Switchboard.urlBlacklist.remove(host, path);
-        }
         
         for (final BlacklistType supportedBlacklistType : BlacklistType.values()) {
             if (Switchboard.urlBlacklist.getFileName(supportedBlacklistType) != blacklistToUse) {
-            	continue;
+            	Switchboard.urlBlacklist.remove(supportedBlacklistType, host, path);
+            }
+            else {
+	            Blacklist bl = new Blacklist(ListManager.listsPath);
+	        	bl.loadList(supportedBlacklistType, blacklistToUse, "/");
+	        	
+	        	bl.remove(host, path);
             }
-            
-            Blacklist bl = new Blacklist(ListManager.listsPath);
-        	bl.loadList(supportedBlacklistType, blacklistToUse, "/");
-        	
-        	bl.remove(host, path);
         }
         
         SearchEventCache.cleanupEvents(true);
@@ -618,20 +616,17 @@ public class Blacklist_p {
         int pos = newEntry.indexOf('/',0);
         String host = newEntry.substring(0, pos);
         String path = newEntry.substring(pos + 1);
-
-        if (Switchboard.urlBlacklist.getFileName(BlacklistType.DHT) == blacklistToUse) {
-        	Switchboard.urlBlacklist.add(host, path);	
-        }
         
         for (final BlacklistType supportedBlacklistType : BlacklistType.values()) {
-            if (Switchboard.urlBlacklist.getFileName(supportedBlacklistType) != blacklistToUse) {
-            	continue;
+            if (Switchboard.urlBlacklist.getFileName(supportedBlacklistType) == blacklistToUse) {
+            	Switchboard.urlBlacklist.add(supportedBlacklistType, host, path);
+            }
+            else {
+		    	Blacklist bl = new Blacklist(ListManager.listsPath);
+		    	bl.loadList(supportedBlacklistType, blacklistToUse, "/");
+		    	
+		    	bl.add(supportedBlacklistType, host, path); 
             }
-            
-	    	Blacklist bl = new Blacklist(ListManager.listsPath);
-	    	bl.loadList(supportedBlacklistType, blacklistToUse, "/");
-	    	
-	    	bl.add(supportedBlacklistType, host, path);    	
         }
         
         SearchEventCache.cleanupEvents(true);