Changeset 25fd488

Timestamp:

Nov 27, 2016 3:58:57 PM (4 years ago)

Author:

zzz <zzz@…>

Branches:

master

Children:

04321e6

Parents:

850f150

Message:

Blocklist: Read feed file before user-specified file

File:

• router/java/src/net/i2p/router/Blocklist.java (modified) (3 diffs)

router/java/src/net/i2p/router/Blocklist.java

@@ -117 +117 @@
      *  $I2P/blocklist.txt
      *  ~/.i2p/blocklist.txt
+     *  ~/.i2p/docs/feed/blocklist/blocklist.txt
      *  File if specified with router.blocklist.file
      */
@@ -132 +133 @@
             files.add(blFile);
         }
+        files.add(_blocklistFeedFile);
         // user specified
         String file = _context.getProperty(PROP_BLOCKLIST_FILE);
@@ -140 +142 @@
             files.add(blFile);
         }
-        files.add(_blocklistFeedFile);
         Job job = new ReadinJob(files);
         job.getTiming().setStartAfter(_context.clock().now() + 30*1000);