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
history.txt
View File

@ -6,6 +6,7 @@
- Fix http://i2p/b64/ and /eepproxy/site/ requests - Fix http://i2p/b64/ and /eepproxy/site/ requests
- Disallow a port specified for an i2p address - Disallow a port specified for an i2p address
- Cleanup and comments - Cleanup and comments
- For more info see http://zzz.i2p/topics/566
* i2psnark: * i2psnark:
- Fix NPE after create file failure - Fix NPE after create file failure
- Sanitize more characters in file names - Sanitize more characters in file names
@ -21,6 +22,7 @@
- Don't instantiate and start TWPMQ Cleaner and OutboundRefiller - Don't instantiate and start TWPMQ Cleaner and OutboundRefiller
threads, part of priority queues unused since 0.6.1.11 threads, part of priority queues unused since 0.6.1.11
- Don't instantiate and start UDPFlooder, it is for testing only - Don't instantiate and start UDPFlooder, it is for testing only
- Prevent NPE http://zzz.i2p/topics/571
2010-02-23 zzz 2010-02-23 zzz
* Unzip: Any files in the zip with a .jar.pack or .war.pack extension * Unzip: Any files in the zip with a .jar.pack or .war.pack extension

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

@ -18,7 +18,7 @@ public class RouterVersion {
/** deprecated */ /** deprecated */
public final static String ID = "Monotone"; public final static String ID = "Monotone";
public final static String VERSION = CoreVersion.VERSION; public final static String VERSION = CoreVersion.VERSION;
public final static long BUILD = 6; public final static long BUILD = 7;
/** for example "-test" */ /** for example "-test" */
public final static String EXTRA = ""; 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); options.setProperty(UDPAddress.PROP_CAPACITY, ""+UDPAddress.CAPACITY_TESTING + UDPAddress.CAPACITY_INTRODUCER);
if (directIncluded || introducersIncluded) { 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(); RouterAddress addr = new RouterAddress();
if (ADJUST_COST && !haveCapacity()) if (ADJUST_COST && !haveCapacity())