From 0c672ecc4969cda90f917a89127b8b02e7f990bb Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Sat, 16 May 2015 13:10:07 +0000
Subject: [PATCH] Update: Fix NPE in initialization
---
.../java/src/net/i2p/router/update/ConsoleUpdateManager.java | 4 ++--
router/java/src/net/i2p/router/RouterVersion.java | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/apps/routerconsole/java/src/net/i2p/router/update/ConsoleUpdateManager.java b/apps/routerconsole/java/src/net/i2p/router/update/ConsoleUpdateManager.java
index 885414ce14..ea153725cb 100644
--- a/apps/routerconsole/java/src/net/i2p/router/update/ConsoleUpdateManager.java
+++ b/apps/routerconsole/java/src/net/i2p/router/update/ConsoleUpdateManager.java
@@ -183,7 +183,7 @@ public class ConsoleUpdateManager implements UpdateManager, RouterApp {
String newVersion = _context.getProperty(PROP_UNSIGNED_AVAILABLE);
if (newVersion != null) {
List<URI> updateSources = uuh.getUpdateSources();
- if (uuh != null) {
+ if (updateSources != null) {
VersionAvailable newVA = new VersionAvailable(newVersion, "", HTTP, updateSources);
_available.put(new UpdateItem(ROUTER_UNSIGNED, ""), newVA);
}
@@ -196,7 +196,7 @@ public class ConsoleUpdateManager implements UpdateManager, RouterApp {
if (newVersion != null) {
if (VersionComparator.comp(newVersion, RouterVersion.FULL_VERSION) > 0) {
List<URI> updateSources = dsuh.getUpdateSources();
- if (dsuh != null) {
+ if (updateSources != null) {
VersionAvailable newVA = new VersionAvailable(newVersion, "", HTTP, updateSources);
_available.put(new UpdateItem(ROUTER_DEV_SU3, ""), newVA);
}
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index 3c775e75ad..0e04b1445c 100644
--- a/router/java/src/net/i2p/router/RouterVersion.java
+++ b/router/java/src/net/i2p/router/RouterVersion.java
@@ -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 = 25;
+ public final static long BUILD = 26;
/** for example "-test" */
public final static String EXTRA = "-rc";
--
GitLab