clean up warnings

This commit is contained in:
zzz
2017-03-07 15:33:33 +00:00
parent ab14737fd1
commit 758c0865dc
3 changed files with 17 additions and 12 deletions

View File

@ -64,7 +64,8 @@
if (xff != null || xfs != null) {
fail = true;
msg = "Non-I2P access denied";
response.setStatus(403, msg);
//response.setStatus(403, msg);
response.setStatus(403);
}
if (info_hash == null && !fail) {
@ -177,7 +178,7 @@
} catch (NumberFormatException nfe) {};
}
Map<String, Object> m = new HashMap(8);
Map<String, Object> m = new HashMap<String, Object>(8);
if (fail) {
m.put("failure reason", msg);
} else if ("stopped".equals(event)) {
@ -219,13 +220,13 @@
// snark < 0.7.13 always wants a list
m.put("peers", java.util.Collections.EMPTY_LIST);
} else {
List<Peer> peerlist = new ArrayList(peers.values());
List<Peer> peerlist = new ArrayList<Peer>(peers.values());
peerlist.remove(p); // them
if (want < size - 1) {
if (size > 150) {
// If size is huge, use random iterator for efficiency
List<Peer> rv = new ArrayList<Peer>(size);
for (RandomIterator<Peer> iter = new RandomIterator(peerlist); iter.hasNext(); ) {
for (RandomIterator<Peer> iter = new RandomIterator<Peer>(peerlist); iter.hasNext(); ) {
rv.add(iter.next());
}
peerlist = rv;

View File

@ -45,7 +45,8 @@
if (xff != null || xfs != null) {
fail = true;
msg = "Non-I2P access denied";
response.setStatus(403, msg);
//response.setStatus(403, msg);
response.setStatus(403);
}
boolean all = info_hash == null;
@ -67,21 +68,21 @@
}
// build 3-level dictionary
Map<String, Object> m = new HashMap(4);
Map<String, Object> m = new HashMap<String, Object>(4);
if (fail) {
m.put("failure reason", msg);
} else {
List<InfoHash> ihList = new ArrayList();
List<InfoHash> ihList = new ArrayList<InfoHash>();
if (all)
ihList.addAll(torrents.keySet());
else
ihList.add(ih);
Map<String, Map> files = new HashMap();
Map<String, Map> files = new HashMap<String, Map>();
for (InfoHash ihash : ihList) {
Peers peers = torrents.get(ihash);
if (peers == null)
continue;
Map<String, Object> dict = new HashMap();
Map<String, Object> dict = new HashMap<String, Object>();
int size = peers.size();
int seeds = peers.countSeeds();
dict.put("complete", Integer.valueOf(seeds));

View File

@ -40,7 +40,8 @@
if (xff != null || xfs != null) {
String msg = "Non-I2P access denied";
response.setStatus(403, msg);
//response.setStatus(403, msg);
response.setStatus(403);
out.println(msg);
} else if (req == null) {
// probe
@ -63,7 +64,8 @@
// all the peers
Torrents torrents = ZzzOTController.getTorrents();
if (torrents == null) {
response.setStatus(503, "Down");
//response.setStatus(503, "Down");
response.setStatus(503);
return;
}
for (InfoHash ihash : torrents.keySet()) {
@ -92,7 +94,8 @@
}
} else {
// error code
response.setStatus(406, "Bad request");
//response.setStatus(406, "Bad request");
response.setStatus(406);
out.println("SC_NOT_ACCEPTABLE");
}