I2P_Developers/i2p.itoopie
3
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Add synch to fix race causing AIOOBE

Browse Source 
http://forum.i2p/viewtopic.php?t=5061
This commit is contained in:
zzz
2010-10-31 14:36:56 +00:00
parent 2ea3f9b9bb
commit 0afabbd609
1 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
router/java/src/net/i2p/router/client/ClientConnectionRunner.java
View File

@ -361,6 +361,8 @@ public class ClientConnectionRunner {
// TunnelPool.locked_buildNewLeaseSet() ensures that leases are sorted, // TunnelPool.locked_buildNewLeaseSet() ensures that leases are sorted,
// so the comparison will always work. // so the comparison will always work.
int leases = set.getLeaseCount(); int leases = set.getLeaseCount();
// synch so _currentLeaseSet isn't changed out from under us
synchronized (this) {
if (_currentLeaseSet != null && _currentLeaseSet.getLeaseCount() == leases) { if (_currentLeaseSet != null && _currentLeaseSet.getLeaseCount() == leases) {
for (int i = 0; i < leases; i++) { for (int i = 0; i < leases; i++) {
if (! _currentLeaseSet.getLease(i).getTunnelId().equals(set.getLease(i).getTunnelId())) if (! _currentLeaseSet.getLease(i).getTunnelId().equals(set.getLease(i).getTunnelId()))
@ -376,6 +378,7 @@ public class ClientConnectionRunner {
} }
} }
} }
}
if (_log.shouldLog(Log.INFO)) if (_log.shouldLog(Log.INFO))
_log.info("Current leaseSet " + _currentLeaseSet + "\nNew leaseSet " + set); _log.info("Current leaseSet " + _currentLeaseSet + "\nNew leaseSet " + set);
LeaseRequestState state = null; LeaseRequestState state = null;