Author: j16sdiz
Date: 2008-09-06 06:35:58 +0000 (Sat, 06 Sep 2008)
New Revision: 22489
Modified:
trunk/freenet/src/freenet/node/updater/UpdateOverMandatoryManager.java
Log:
warning hunt: freenet.node.updater
Modified: trunk/freenet/src/freenet/node/updater/UpdateOverMandatoryManager.java
===================================================================
--- trunk/freenet/src/freenet/node/updater/UpdateOverMandatoryManager.java
2008-09-06 06:35:37 UTC (rev 22488)
+++ trunk/freenet/src/freenet/node/updater/UpdateOverMandatoryManager.java
2008-09-06 06:35:58 UTC (rev 22489)
@@ -6,6 +6,7 @@
import java.io.BufferedInputStream;
import java.io.DataInputStream;
import java.io.File;
+import java.io.FileFilter;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
@@ -49,7 +50,6 @@
import freenet.support.TimeUtil;
import freenet.support.io.FileBucket;
import freenet.support.io.RandomAccessFileWrapper;
-import java.io.FileFilter;
/**
* Co-ordinates update over mandatory. Update over mandatory = updating from
your peers, even
@@ -64,16 +64,16 @@
/** Set of PeerNode's which say (or said before they disconnected)
* the key has been revoked */
- private final HashSet nodesSayKeyRevoked;
+ private final HashSet<PeerNode> nodesSayKeyRevoked;
/** Set of PeerNode's which say the key has been revoked but failed
* to transfer the revocation key. */
- private final HashSet nodesSayKeyRevokedFailedTransfer;
+ private final HashSet<PeerNode> nodesSayKeyRevokedFailedTransfer;
/** PeerNode's which have offered the main jar which we are not
fetching it from right now */
- private final HashSet nodesOfferedMainJar;
+ private final HashSet<PeerNode> nodesOfferedMainJar;
/** PeerNode's we've asked to send the main jar */
- private final HashSet nodesAskedSendMainJar;
+ private final HashSet<PeerNode> nodesAskedSendMainJar;
/** PeerNode's sending us the main jar */
- private final HashSet nodesSendingMainJar;
+ private final HashSet<PeerNode> nodesSendingMainJar;
// 2 for reliability, no more as gets very slow/wasteful
static final int MAX_NODES_SENDING_MAIN_JAR = 2;
/** Maximum time between asking for the main jar and it starting to
transfer */
@@ -88,11 +88,11 @@
public UpdateOverMandatoryManager(NodeUpdateManager manager) {
this.updateManager = manager;
- nodesSayKeyRevoked = new HashSet();
- nodesSayKeyRevokedFailedTransfer = new HashSet();
- nodesOfferedMainJar = new HashSet();
- nodesAskedSendMainJar = new HashSet();
- nodesSendingMainJar = new HashSet();
+ nodesSayKeyRevoked = new HashSet<PeerNode>();
+ nodesSayKeyRevokedFailedTransfer = new HashSet<PeerNode>();
+ nodesOfferedMainJar = new HashSet<PeerNode>();
+ nodesAskedSendMainJar = new HashSet<PeerNode>();
+ nodesSendingMainJar = new HashSet<PeerNode>();
logMINOR = Logger.shouldLog(Logger.MINOR, this);
}
@@ -356,7 +356,7 @@
>= MAX_NODES_SENDING_MAIN_JAR)
return;
if(nodesOfferedMainJar.isEmpty()) return;
- offers = (PeerNode[])
nodesOfferedMainJar.toArray(new PeerNode[nodesOfferedMainJar.size()]);
+ offers = nodesOfferedMainJar.toArray(new
PeerNode[nodesOfferedMainJar.size()]);
}
for(int i=0;i<offers.length;i++) {
if(offers[i].isConnected()) continue;
@@ -498,11 +498,11 @@
}
public PeerNode[][] getNodesSayBlown() {
- Vector nodesConnectedSayRevoked = new Vector();
- Vector nodesDisconnectedSayRevoked = new Vector();
- Vector nodesFailedSayRevoked = new Vector();
+ Vector<PeerNode> nodesConnectedSayRevoked = new
Vector<PeerNode>();
+ Vector<PeerNode> nodesDisconnectedSayRevoked = new
Vector<PeerNode>();
+ Vector<PeerNode> nodesFailedSayRevoked = new Vector<PeerNode>();
synchronized(this) {
- PeerNode[] nodesSayRevoked = (PeerNode[])
nodesSayKeyRevoked.toArray(new PeerNode[nodesSayKeyRevoked.size()]);
+ PeerNode[] nodesSayRevoked =
nodesSayKeyRevoked.toArray(new PeerNode[nodesSayKeyRevoked.size()]);
for(int i=0;i<nodesSayRevoked.length;i++) {
PeerNode pn = nodesSayRevoked[i];
if(nodesSayKeyRevokedFailedTransfer.contains(pn))
@@ -512,7 +512,7 @@
}
}
for(int i=0;i<nodesConnectedSayRevoked.size();i++) {
- PeerNode pn = (PeerNode)
nodesConnectedSayRevoked.get(i);
+ PeerNode pn = nodesConnectedSayRevoked.get(i);
if(!pn.isConnected()) {
nodesDisconnectedSayRevoked.add(pn);
nodesConnectedSayRevoked.remove(i);
@@ -521,9 +521,9 @@
}
}
return new PeerNode[][] {
- (PeerNode[])
nodesConnectedSayRevoked.toArray(new PeerNode[nodesConnectedSayRevoked.size()]),
- (PeerNode[])
nodesDisconnectedSayRevoked.toArray(new
PeerNode[nodesDisconnectedSayRevoked.size()]),
- (PeerNode[]) nodesFailedSayRevoked.toArray(new
PeerNode[nodesFailedSayRevoked.size()]),
+ nodesConnectedSayRevoked.toArray(new
PeerNode[nodesConnectedSayRevoked.size()]),
+ nodesDisconnectedSayRevoked.toArray(new
PeerNode[nodesDisconnectedSayRevoked.size()]),
+ nodesFailedSayRevoked.toArray(new
PeerNode[nodesFailedSayRevoked.size()]),
};
}
