From 25fd488db08c9c07f6dac0d90fbb25e2078c5736 Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Sun, 27 Nov 2016 15:58:57 +0000
Subject: [PATCH] Blocklist: Read feed file before user-specified file
---
router/java/src/net/i2p/router/Blocklist.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/router/java/src/net/i2p/router/Blocklist.java b/router/java/src/net/i2p/router/Blocklist.java
index 95b0578ef7..5b78e3c930 100644
--- a/router/java/src/net/i2p/router/Blocklist.java
+++ b/router/java/src/net/i2p/router/Blocklist.java
@@ -116,6 +116,7 @@ public class Blocklist {
* Loads the following files in-order:
* $I2P/blocklist.txt
* ~/.i2p/blocklist.txt
+ * ~/.i2p/docs/feed/blocklist/blocklist.txt
* File if specified with router.blocklist.file
*/
public void startup() {
@@ -131,6 +132,7 @@ public class Blocklist {
blFile = new File(_context.getConfigDir(), BLOCKLIST_FILE_DEFAULT);
files.add(blFile);
}
+ files.add(_blocklistFeedFile);
// user specified
String file = _context.getProperty(PROP_BLOCKLIST_FILE);
if (file != null && !file.equals(BLOCKLIST_FILE_DEFAULT)) {
@@ -139,7 +141,6 @@ public class Blocklist {
blFile = new File(_context.getConfigDir(), file);
files.add(blFile);
}
- files.add(_blocklistFeedFile);
Job job = new ReadinJob(files);
job.getTiming().setStartAfter(_context.clock().now() + 30*1000);
_context.jobQueue().addJob(job);
--
GitLab