Changeset 25fd488 for router


Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed
  • router/java/src/net/i2p/router/Blocklist.java

    r850f150 r25fd488  
    117117     *  $I2P/blocklist.txt
    118118     *  ~/.i2p/blocklist.txt
     119     *  ~/.i2p/docs/feed/blocklist/blocklist.txt
    119120     *  File if specified with router.blocklist.file
    120121     */
     
    132133            files.add(blFile);
    133134        }
     135        files.add(_blocklistFeedFile);
    134136        // user specified
    135137        String file = _context.getProperty(PROP_BLOCKLIST_FILE);
     
    140142            files.add(blFile);
    141143        }
    142         files.add(_blocklistFeedFile);
    143144        Job job = new ReadinJob(files);
    144145        job.getTiming().setStartAfter(_context.clock().now() + 30*1000);
Note: See TracChangeset for help on using the changeset viewer.