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

Util: Add sort methods that catch IAE

Browse Source
This commit is contained in:
zzz
2018-02-12 18:49:01 +00:00
parent 1826fcee0c
commit 6193e487c8
4 changed files with 61 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
router/java/src/net/i2p/router/tunnel/pool/BuildExecutor.java
View File

@@ -8,6 +8,7 @@ import java.util.Iterator;
import java.util.List;
import java.util.concurrent.ConcurrentHashMap;
import net.i2p.data.DataHelper;
import net.i2p.data.Hash;
import net.i2p.data.i2np.I2NPMessage;
import net.i2p.data.router.RouterInfo;
@@ -382,12 +383,8 @@ class BuildExecutor implements Runnable {
// to the front of the line sometimes, to prevent being "locked up"
// for several minutes.
boolean preferEmpty = _context.random().nextInt(4) != 0;
try {
Collections.sort(wanted, new TunnelPoolComparator(preferEmpty));
} catch (IllegalArgumentException iae) {
// Java 7 TimSort - see info in TunnelPoolComparator
continue;
}
// Java 7 TimSort - see info in TunnelPoolComparator
DataHelper.sort(wanted, new TunnelPoolComparator(preferEmpty));
}
// force the loops to be short, since 3 consecutive tunnel build requests can take