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

move null check to constructor

Browse Source
This commit is contained in:
zzz
2014-08-23 13:16:57 +00:00
parent efebecfc67
commit d76164679f
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
router/java/src/net/i2p/router/peermanager/PeerProfile.java
View File

@ -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; }
/**

1
router/java/src/net/i2p/router/peermanager/ProfileOrganizer.java
View File

@ -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);