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

correct the error in the previous checkin

Browse Source
This commit is contained in:
idk
2023-06-26 16:44:37 -04:00
parent e55e6bc7a2
commit eb0c8aaaa9
1 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
router/java/src/net/i2p/router/Blocklist.java
View File

@ -147,7 +147,7 @@ public class Blocklist {
_blocklistFeedFile = new File(BLOCKLIST_FEED_FILE); _blocklistFeedFile = new File(BLOCKLIST_FEED_FILE);
_haveIPv6 = TransportUtil.getIPv6Config(_context, "SSU") != TransportUtil.IPv6Config.IPV6_DISABLED && _haveIPv6 = TransportUtil.getIPv6Config(_context, "SSU") != TransportUtil.IPv6Config.IPV6_DISABLED &&
Addresses.isConnectedIPv6(); Addresses.isConnectedIPv6();
Blocklist = _haveIPv6 ? new LHMCache<BigInteger, Object>(MAX_IPV6_SINGLES) : null; _singleIPv6Blocklist = _haveIPv6 ? new LHMCache<BigInteger, Object>(MAX_IPV6_SINGLES) : null;
} }
@ -896,10 +896,12 @@ public class Blocklist {
* @since IPv6 * @since IPv6
*/ */
private boolean add(BigInteger ip) { private boolean add(BigInteger ip) {
synchronized(_singleIPv6Blocklist) { if (_singleIPv6Blocklist != null) {
if (_singleIPv6Blocklist != null) synchronized(_singleIPv6Blocklist) {
return _singleIPv6Blocklist.put(ip, DUMMY) == null; return _singleIPv6Blocklist.put(ip, DUMMY) == null;
}
} }
return false;
} }
/** /**
@ -907,9 +909,10 @@ public class Blocklist {
* @since 0.9.28 * @since 0.9.28
*/ */
private void remove(BigInteger ip) { private void remove(BigInteger ip) {
synchronized(_singleIPv6Blocklist) { if (_singleIPv6Blocklist != null) {
if (_singleIPv6Blocklist != null) synchronized(_singleIPv6Blocklist) {
_singleIPv6Blocklist.remove(ip); _singleIPv6Blocklist.remove(ip);
}
} }
} }
@ -918,10 +921,12 @@ public class Blocklist {
* @since IPv6 * @since IPv6
*/ */
private boolean isOnSingleList(BigInteger ip) { private boolean isOnSingleList(BigInteger ip) {
synchronized(_singleIPv6Blocklist) { if (_singleIPv6Blocklist != null) {
if (_singleIPv6Blocklist != null) synchronized(_singleIPv6Blocklist) {
return _singleIPv6Blocklist.get(ip) != null; return _singleIPv6Blocklist.get(ip) != null;
}
} }
return false;
} }
/** /**
@ -1365,10 +1370,12 @@ public class Blocklist {
public List<BigInteger> getTransientIPv6Blocks() { public List<BigInteger> getTransientIPv6Blocks() {
if (!_haveIPv6) if (!_haveIPv6)
return Collections.<BigInteger>emptyList(); return Collections.<BigInteger>emptyList();
synchronized(_singleIPv6Blocklist) { if (_singleIPv6Blocklist != null) {
if (_singleIPv6Blocklist != null) synchronized(_singleIPv6Blocklist) {
return new ArrayList<BigInteger>(_singleIPv6Blocklist.keySet()); return new ArrayList<BigInteger>(_singleIPv6Blocklist.keySet());
}
} }
return Collections.<BigInteger>emptyList();
} }
/** /**