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

Prevent UDP startup NPE http://zzz.i2p/topics/571

Browse Source
This commit is contained in:
zzz
2010-02-27 14:38:52 +00:00
parent efdc8e5df0
commit 8081d053cc
3 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@ -1264,7 +1264,9 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority
options.setProperty(UDPAddress.PROP_CAPACITY, ""+UDPAddress.CAPACITY_TESTING + UDPAddress.CAPACITY_INTRODUCER);
if (directIncluded || introducersIncluded) {
options.setProperty(UDPAddress.PROP_INTRO_KEY, _introKey.toBase64());
// This is called via TransportManager.configTransports() before startup(), prevent NPE
if (_introKey != null)
options.setProperty(UDPAddress.PROP_INTRO_KEY, _introKey.toBase64());
RouterAddress addr = new RouterAddress();
if (ADJUST_COST && !haveCapacity())