From c05cd07ff7099d34f21f8450d40c5b005c1c8e30 Mon Sep 17 00:00:00 2001
From: kytv <kytv@mail.i2p>
Date: Tue, 1 Jan 2013 00:02:18 +0000
Subject: [PATCH] Fixing two potential NPEs found by findbugs
---
.../src/net/i2p/router/update/PluginUpdateRunner.java | 7 +++++--
.../src/net/i2p/router/peermanager/ProfileOrganizer.java | 8 +++++---
2 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/apps/routerconsole/java/src/net/i2p/router/update/PluginUpdateRunner.java b/apps/routerconsole/java/src/net/i2p/router/update/PluginUpdateRunner.java
index 559fa58ca5..4c8c394818 100644
--- a/apps/routerconsole/java/src/net/i2p/router/update/PluginUpdateRunner.java
+++ b/apps/routerconsole/java/src/net/i2p/router/update/PluginUpdateRunner.java
@@ -2,6 +2,7 @@ package net.i2p.router.update;
import java.io.File;
import java.io.IOException;
+import java.lang.IllegalArgumentException;
import java.net.URI;
import java.util.List;
import java.util.Map;
@@ -37,6 +38,8 @@ import net.i2p.util.VersionComparator;
* then fetch the first 56 bytes of the URL, extract the version,
* and compare.
*
+ * uri list must not be empty.
+ *
* Moved from web/ and turned into an UpdateTask.
*
* @since 0.9.4 moved from PluginUpdateHandler
@@ -55,10 +58,10 @@ class PluginUpdateRunner extends UpdateRunner {
public static final String PLUGIN_DIR = PluginStarter.PLUGIN_DIR;
public PluginUpdateRunner(RouterContext ctx, ConsoleUpdateManager mgr, List<URI> uris,
- String appName, String oldVersion ) {
+ String appName, String oldVersion ) {
super(ctx, mgr, uris);
if (uris.isEmpty())
- _uri = null;
+ throw new IllegalArgumentException("uri cannot be empty");
else
_uri = uris.get(0);
_xpi2pURL = _uri.toString();
diff --git a/router/java/src/net/i2p/router/peermanager/ProfileOrganizer.java b/router/java/src/net/i2p/router/peermanager/ProfileOrganizer.java
index 9248df85e5..55b57bae93 100644
--- a/router/java/src/net/i2p/router/peermanager/ProfileOrganizer.java
+++ b/router/java/src/net/i2p/router/peermanager/ProfileOrganizer.java
@@ -184,12 +184,14 @@ public class ProfileOrganizer {
*
*/
public PeerProfile addProfile(PeerProfile profile) {
+ if (profile == null) return null;
+
Hash peer = profile.getPeer();
- if (profile == null || peer == null) return null;
-
+ if (peer == null) return null;
+
if (_log.shouldLog(Log.DEBUG))
_log.debug("New profile created for " + peer);
-
+
PeerProfile old = getProfile(peer);
profile.coalesceStats();
if (!getWriteLock())
--
GitLab