Author: toad
Date: 2007-08-22 23:49:54 +0000 (Wed, 22 Aug 2007)
New Revision: 14852
Modified:
trunk/freenet/src/freenet/node/LocationManager.java
trunk/freenet/src/freenet/node/Node.java
Log:
Fix NPE, start the sender :|
Modified: trunk/freenet/src/freenet/node/LocationManager.java
===================================================================
--- trunk/freenet/src/freenet/node/LocationManager.java 2007-08-22 23:44:31 UTC
(rev 14851)
+++ trunk/freenet/src/freenet/node/LocationManager.java 2007-08-22 23:49:54 UTC
(rev 14852)
@@ -64,13 +64,14 @@
private static boolean logMINOR;
final RandomSource r;
final SwapRequestSender sender;
- Node node;
+ final Node node;
long timeLastSuccessfullySwapped;
- public LocationManager(RandomSource r) {
+ public LocationManager(RandomSource r, Node node) {
loc = r.nextDouble();
sender = new SwapRequestSender();
this.r = r;
+ this.node = node;
recentlyForwardedIDs = new Hashtable();
// FIXME persist to disk!
averageSwapTime = new
BootstrappingDecayingRunningAverage(SEND_SWAP_INTERVAL, 0, Integer.MAX_VALUE,
20, null);
@@ -131,9 +132,8 @@
* Start a thread to send FNPSwapRequests every second when
* we are not locked.
*/
- public void startSender(Node n) {
- this.node = n;
- n.executor.execute(sender, "SwapRequest sender");
+ public void startSender() {
+ node.executor.execute(sender, "SwapRequest sender");
}
/**
Modified: trunk/freenet/src/freenet/node/Node.java
===================================================================
--- trunk/freenet/src/freenet/node/Node.java 2007-08-22 23:44:31 UTC (rev
14851)
+++ trunk/freenet/src/freenet/node/Node.java 2007-08-22 23:49:54 UTC (rev
14852)
@@ -538,7 +538,7 @@
random.nextBytes(buffer);
this.fastWeakRandom = new MersenneTwister(buffer);
cachedPubKeys = new LRUHashtable();
- lm = new LocationManager(random);
+ lm = new LocationManager(random, this);
try {
localhostAddress = InetAddress.getByName("127.0.0.1");
@@ -1285,6 +1285,9 @@
// pluginManager3 = new
freenet.plugin_new.PluginManager(pluginManagerConfig);
ipDetector.start();
+
+ // Start sending swaps
+ lm.startSender();
// Node Updater
try{
