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

SSU: Rewrite/fix previous Java 7 (Android) fix

Browse Source 
Update checklist to specify bootclasspath, so these are caught in the future
bump -16-rc
This commit is contained in:
zzz
2023-01-08 14:45:17 -05:00
parent 433340c11b
commit 1e34738fca
4 changed files with 22 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
history.txt
View File

@ -1,3 +1,9 @@
2023-01-08 zzz
* AppArmor: Allow classes.jsa in other locations
* SSU:
- Fix NPE handling SSU1 peer test msg 7
- Build fix for Java 7
2023-01-03 zzz
* Console: Add link to sort netdb country chart by count

4
installer/resources/checklist.md
View File

@ -35,8 +35,8 @@
with a recent Oracle JDK (12+), and fix any issues.
Oracle JDK will error on things that OpenJDK does not!
- Java 7 test: 'ant mavenCentral.deps' to ensure
that Android will build correcly; fix any issues
- Java 7 test: 'ant mavenCentral.deps' with a Java 7 bootclasspath in override.properties
to ensure that Android will build correcly; fix any issues
## A day or two before

2
router/java/src/net/i2p/router/RouterVersion.java
View File

@ -18,7 +18,7 @@ public class RouterVersion {
/** deprecated */
public final static String ID = "Git";
public final static String VERSION = CoreVersion.VERSION;
public final static long BUILD = 15;
public final static long BUILD = 16;
/** for example "-test" */
public final static String EXTRA = "-rc";

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

@ -1736,12 +1736,9 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority
Long id = Long.valueOf(peer.getRcvConnID());
PeerStateDestroyed oldPSD;
synchronized(_addDropLock) {
if (_recentlyClosedConnIDs.containsKey(id)){
oldPSD = _recentlyClosedConnIDs.put(id, peer);
oldPSD = _recentlyClosedConnIDs.get(id);
}else{
oldPSD = _recentlyClosedConnIDs.get(id);
}
oldPSD = _recentlyClosedConnIDs.put(id, peer);
if (oldPSD != null)
_recentlyClosedConnIDs.put(id, oldPSD); // put the old one back
}
if (oldPSD != null)
peer.kill();
@ -1933,15 +1930,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;
if (_recentlyClosedConnIDs.containsKey(id)){
oldPSD = _recentlyClosedConnIDs.put(id, newPSD);
oldPSD = _recentlyClosedConnIDs.get(id);
}else{
oldPSD = _recentlyClosedConnIDs.get(id);
}
if (oldPSD != null)
PeerStateDestroyed oldPSD = _recentlyClosedConnIDs.put(id, newPSD);
if (oldPSD != null) {
// put the old one back, kill new one
_recentlyClosedConnIDs.put(id, oldPSD);
newPSD.kill();
}
_peersByConnID.remove(id);
}
}
@ -2198,15 +2192,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;
if (_recentlyClosedConnIDs.containsKey(id)){
oldPSD = _recentlyClosedConnIDs.put(id, newPSD);
oldPSD = _recentlyClosedConnIDs.get(id);
}else{
oldPSD = _recentlyClosedConnIDs.get(id);
}
if (oldPSD != null)
PeerStateDestroyed oldPSD = _recentlyClosedConnIDs.put(id, newPSD);
if (oldPSD != null) {
// put the old one back, kill new one
_recentlyClosedConnIDs.put(id, oldPSD);
newPSD.kill();
}
_peersByConnID.remove(id);
}