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

Update: Fix NPE in initialization

Browse Source
This commit is contained in:
zzz
2015-05-16 13:10:07 +00:00
parent 3b6d98fe38
commit 0c672ecc49
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apps/routerconsole/java/src/net/i2p/router/update/ConsoleUpdateManager.java
View File

@ -183,7 +183,7 @@ public class ConsoleUpdateManager implements UpdateManager, RouterApp {
String newVersion = _context.getProperty(PROP_UNSIGNED_AVAILABLE); String newVersion = _context.getProperty(PROP_UNSIGNED_AVAILABLE);
if (newVersion != null) { if (newVersion != null) {
List<URI> updateSources = uuh.getUpdateSources(); List<URI> updateSources = uuh.getUpdateSources();
if (uuh != null) { if (updateSources != null) {
VersionAvailable newVA = new VersionAvailable(newVersion, "", HTTP, updateSources); VersionAvailable newVA = new VersionAvailable(newVersion, "", HTTP, updateSources);
_available.put(new UpdateItem(ROUTER_UNSIGNED, ""), newVA); _available.put(new UpdateItem(ROUTER_UNSIGNED, ""), newVA);
} }
@ -196,7 +196,7 @@ public class ConsoleUpdateManager implements UpdateManager, RouterApp {
if (newVersion != null) { if (newVersion != null) {
if (VersionComparator.comp(newVersion, RouterVersion.FULL_VERSION) > 0) { if (VersionComparator.comp(newVersion, RouterVersion.FULL_VERSION) > 0) {
List<URI> updateSources = dsuh.getUpdateSources(); List<URI> updateSources = dsuh.getUpdateSources();
if (dsuh != null) { if (updateSources != null) {
VersionAvailable newVA = new VersionAvailable(newVersion, "", HTTP, updateSources); VersionAvailable newVA = new VersionAvailable(newVersion, "", HTTP, updateSources);
_available.put(new UpdateItem(ROUTER_DEV_SU3, ""), newVA); _available.put(new UpdateItem(ROUTER_DEV_SU3, ""), newVA);
} }

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 = 25; public final static long BUILD = 26;
/** for example "-test" */ /** for example "-test" */
public final static String EXTRA = "-rc"; public final static String EXTRA = "-rc";