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

about 20 findbugs fixes all over

Browse Source
This commit is contained in:
zzz
2013-11-10 20:07:46 +00:00
parent 0a8f79f0e3
commit d2a1025b3f
16 changed files with 92 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
router/java/src/net/i2p/router/Blocklist.java
View File

@@ -525,11 +525,15 @@ public class Blocklist {
byte[] pib = pa.getIP();
if (pib == null) continue;
// O(n**2)
boolean dup = false;
for (int i = 0; i < rv.size(); i++) {
// findbugs triggered on this, looks like unfinished work
//if (DataHelper.eq(rv.get(i), pib)) continue;
if (DataHelper.eq(rv.get(i), pib)) {
dup = true;
break;
}
}
rv.add(pib);
if (!dup)
rv.add(pib);
}
return rv;
}

2
router/java/src/net/i2p/router/transport/GeoIPv6.java
View File

@@ -83,7 +83,7 @@ class GeoIPv6 {
if (!DataHelper.eq(magic, DataHelper.getASCII(MAGIC)))
throw new IOException("Not a IPv6 geoip data file");
// skip timestamp and comments
in.skip(HEADER_LEN - MAGIC.length());
DataHelper.skip(in, HEADER_LEN - MAGIC.length());
byte[] buf = new byte[18];
while (DataHelper.read(in, buf) == 18 && idx < search.length) {
long ip1 = readLong(buf, 0);

12
router/java/src/net/i2p/router/transport/UPnP.java
View File

@@ -415,7 +415,11 @@ class UPnP extends ControlPoint implements DeviceChangeListener, EventListener {
if(getIP == null || !getIP.postControlAction())
return -1;
return Integer.parseInt(getIP.getOutputArgumentList().getArgument("NewUpstreamMaxBitRate").getValue());
try {
return Integer.parseInt(getIP.getOutputArgumentList().getArgument("NewUpstreamMaxBitRate").getValue());
} catch (NumberFormatException nfe) {
return -1;
}
}
/**
@@ -429,7 +433,11 @@ class UPnP extends ControlPoint implements DeviceChangeListener, EventListener {
if(getIP == null || !getIP.postControlAction())
return -1;
return Integer.parseInt(getIP.getOutputArgumentList().getArgument("NewDownstreamMaxBitRate").getValue());
try {
return Integer.parseInt(getIP.getOutputArgumentList().getArgument("NewDownstreamMaxBitRate").getValue());
} catch (NumberFormatException nfe) {
return -1;
}
}
/** debug only */