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

use a containsKey()+put instead of putIfAbsent because putIfAbsent is not present in Java 8, thereby breaking Maven builds

Browse Source
This commit is contained in:
idk
2023-01-08 00:28:26 +00:00
parent b4fb8ba2c9
commit e70229140b
1 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
router/java/src/net/i2p/router/transport/udp/UDPTransport.java
View File

@ -1736,7 +1736,11 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority
Long id = Long.valueOf(peer.getRcvConnID());
PeerStateDestroyed oldPSD;
synchronized(_addDropLock) {
oldPSD = _recentlyClosedConnIDs.putIfAbsent(id, peer);
if (_recentlyClosedConnIDs.containsKey(id)){
oldPSD = _recentlyClosedConnIDs.put(id, peer);
}else{
oldPSD = _recentlyClosedConnIDs.get(id);
}
}
if (oldPSD != null)
peer.kill();
@ -1928,7 +1932,12 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority
PeerState2 state2 = (PeerState2) oldPeer;
Long id = Long.valueOf(state2.getRcvConnID());
PeerStateDestroyed newPSD = new PeerStateDestroyed(_context, this, state2);
PeerStateDestroyed oldPSD = _recentlyClosedConnIDs.putIfAbsent(id, newPSD);
PeerStateDestroyed oldPSD;
if (_recentlyClosedConnIDs.containsKey(id)){
oldPSD = _recentlyClosedConnIDs.put(id, newPSD);
}else{
oldPSD = _recentlyClosedConnIDs.get(id);
}
if (oldPSD != null)
newPSD.kill();
_peersByConnID.remove(id);
@ -2187,7 +2196,12 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority
PeerState2 state2 = (PeerState2) peer;
Long id = Long.valueOf(state2.getRcvConnID());
PeerStateDestroyed newPSD = new PeerStateDestroyed(_context, this, state2);
PeerStateDestroyed oldPSD = _recentlyClosedConnIDs.putIfAbsent(id, newPSD);
PeerStateDestroyed oldPSD;
if (_recentlyClosedConnIDs.containsKey(id)){
oldPSD = _recentlyClosedConnIDs.put(id, newPSD);
}else{
oldPSD = _recentlyClosedConnIDs.get(id);
}
if (oldPSD != null)
newPSD.kill();
_peersByConnID.remove(id);