From d76164679f7c1020ca55c27d2da4d3d5b1d9cf1a Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Sat, 23 Aug 2014 13:16:57 +0000
Subject: [PATCH] move null check to constructor
---
.../i2p/router/peermanager/PeerProfile.java | 18 ++++++++++++------
.../router/peermanager/ProfileOrganizer.java | 1 -
2 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/router/java/src/net/i2p/router/peermanager/PeerProfile.java b/router/java/src/net/i2p/router/peermanager/PeerProfile.java
index ec2e094d35..0ec790c34b 100644
--- a/router/java/src/net/i2p/router/peermanager/PeerProfile.java
+++ b/router/java/src/net/i2p/router/peermanager/PeerProfile.java
@@ -41,10 +41,10 @@ public class PeerProfile {
// periodic rates
//private RateStat _sendSuccessSize = null;
//private RateStat _receiveSize = null;
- private RateStat _dbResponseTime = null;
- private RateStat _tunnelCreateResponseTime = null;
- private RateStat _tunnelTestResponseTime = null;
- private RateStat _dbIntroduction = null;
+ private RateStat _dbResponseTime;
+ private RateStat _tunnelCreateResponseTime;
+ private RateStat _tunnelTestResponseTime;
+ private RateStat _dbIntroduction;
// calculation bonuses
private long _speedBonus;
private long _capacityBonus;
@@ -80,16 +80,22 @@ public class PeerProfile {
_bigCountries.addAll(Arrays.asList(big));
}
+ /**
+ * @param peer non-null
+ */
public PeerProfile(RouterContext context, Hash peer) {
this(context, peer, true);
}
/**
+ * @param peer non-null
* @param expand must be true (see below)
*/
- public PeerProfile(RouterContext context, Hash peer, boolean expand) {
+ private PeerProfile(RouterContext context, Hash peer, boolean expand) {
_context = context;
_log = context.logManager().getLog(PeerProfile.class);
+ if (peer == null)
+ throw new NullPointerException();
_peer = peer;
// this is always true, and there are several places in the router that will NPE
// if it is false, so all need to be fixed before we can have non-expanded profiles
@@ -102,7 +108,7 @@ public class PeerProfile {
_distance = 0;
}
- /** what peer is being profiled */
+ /** what peer is being profiled, non-null */
public Hash getPeer() { return _peer; }
/**
diff --git a/router/java/src/net/i2p/router/peermanager/ProfileOrganizer.java b/router/java/src/net/i2p/router/peermanager/ProfileOrganizer.java
index 1edfbe45d1..a224f576ac 100644
--- a/router/java/src/net/i2p/router/peermanager/ProfileOrganizer.java
+++ b/router/java/src/net/i2p/router/peermanager/ProfileOrganizer.java
@@ -184,7 +184,6 @@ public class ProfileOrganizer {
if (profile == null) return null;
Hash peer = profile.getPeer();
- if (peer == null) return null;
if (_log.shouldLog(Log.DEBUG))
_log.debug("New profile created for " + peer);
--
GitLab