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

* Tunnels: Catch rare BuildExecutor IAE only in Java 7 (ticket #811)

Browse Source
This commit is contained in:
zzz
2012-12-26 14:16:49 +00:00
parent 7c8bb0ba69
commit cf1f42ebf8
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -331,7 +331,12 @@ class BuildExecutor implements Runnable {
} else {
if ( (allowed > 0) && (!wanted.isEmpty()) ) {
Collections.shuffle(wanted, _context.random());
Collections.sort(wanted, new TunnelPoolComparator());
try {
Collections.sort(wanted, new TunnelPoolComparator());
} catch (IllegalArgumentException iae) {
// Java 7 TimSort - see info in TunnelPoolComparator
continue;
}
// force the loops to be short, since 3 consecutive tunnel build requests can take
// a long, long time
@ -391,12 +396,12 @@ class BuildExecutor implements Runnable {
// " built=" + realBuilt +
// " pending=" + pendingRemaining);
wanted.clear();
pools.clear();
} catch (RuntimeException e) {
_log.log(Log.CRIT, "B0rked in the tunnel builder", e);
try { Thread.sleep(LOOP_TIME); } catch (InterruptedException ie) {}
}
wanted.clear();
pools.clear();
}
if (_log.shouldLog(Log.WARN))
@ -412,6 +417,8 @@ class BuildExecutor implements Runnable {
*
* This prevents a large number of client pools from starving the exploratory pool.
*
* WARNING - this sort may be unstable, as a pool's tunnel count may change
* during the sort. This will cause Java 7 sort to throw an IAE.
*/
private static class TunnelPoolComparator implements Comparator<TunnelPool> {
public int compare(TunnelPool tpl, TunnelPool tpr) {