echelon/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Streaming: Fix instantiation failure with blacklist entries,

Browse Source 
caused by bad fix for ticket #1070
This commit is contained in:
zzz
2013-10-27 17:09:29 +00:00
parent 7839c0fec3
commit f0f363e8c3
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/streaming/java/src/net/i2p/client/streaming/ConnectionOptions.java
View File

@ -784,7 +784,7 @@ class ConnectionOptions extends I2PSocketOptionsImpl {
Hash h = ConvertToHash.getHash(hashstr); Hash h = ConvertToHash.getHash(hashstr);
if (h == null) if (h == null)
error("bad list hash: " + hashstr); error("bad list hash: " + hashstr);
else if (_blackListEnabled) else if (blackListEnabled)
blackList.add(h); blackList.add(h);
else else
accessList.add(h); accessList.add(h);

5
history.txt
View File

@ -1,3 +1,6 @@
2013-10-27 zzz
* Streaming; Fix crash caused by previous blacklist fix (ticket #1070)
2013-10-26 zzz 2013-10-26 zzz
* i2psnark: Display base name, not torrent file name (ticket #985) * i2psnark: Display base name, not torrent file name (ticket #985)
* I2PTunnel HTTP server: New POST limiter * I2PTunnel HTTP server: New POST limiter
@ -83,7 +86,7 @@
* Logging: * Logging:
- Require strict match of class name component - Require strict match of class name component
- parseLimits() cleanup - parseLimits() cleanup
* SSU: More efficient ImboundMessageState * SSU: More efficient InboundMessageState
* Streaming: * Streaming:
- Fix active stream counting so it doesn't count streams - Fix active stream counting so it doesn't count streams
that are closed and in TIME-WAIT state. Also, break out of the that are closed and in TIME-WAIT state. Also, break out of the

2
router/java/src/net/i2p/router/RouterVersion.java
View File

@ -18,7 +18,7 @@ public class RouterVersion {
/** deprecated */ /** deprecated */
public final static String ID = "Monotone"; public final static String ID = "Monotone";
public final static String VERSION = CoreVersion.VERSION; public final static String VERSION = CoreVersion.VERSION;
public final static long BUILD = 12; public final static long BUILD = 13;
/** for example "-test" */ /** for example "-test" */
public final static String EXTRA = ""; public final static String EXTRA = "";