Author: toad
Date: 2006-03-21 23:59:30 +0000 (Tue, 21 Mar 2006)
New Revision: 8286
Modified:
trunk/freenet/src/freenet/io/xfer/BlockTransmitter.java
trunk/freenet/src/freenet/node/Version.java
trunk/freenet/src/freenet/node/fcp/ClientRequest.java
Log:
552: Fix some NPEs.
Modified: trunk/freenet/src/freenet/io/xfer/BlockTransmitter.java
===================================================================
--- trunk/freenet/src/freenet/io/xfer/BlockTransmitter.java 2006-03-21
22:37:50 UTC (rev 8285)
+++ trunk/freenet/src/freenet/io/xfer/BlockTransmitter.java 2006-03-21
23:59:30 UTC (rev 8286)
@@ -342,6 +342,7 @@
PartiallyReceivedBlock.PacketReceivedListener myListener;
try {
+ synchronized(_prb) {
_unsent = _prb.addListener(myListener = new
PartiallyReceivedBlock.PacketReceivedListener() {;
public void packetReceived(int packetNo) {
@@ -359,7 +360,7 @@
Logger.minor(this, "Receive aborted and receiver is not
connected");
}
} });
-
+ }
_senderThread.start();
while (true) {
Modified: trunk/freenet/src/freenet/node/Version.java
===================================================================
--- trunk/freenet/src/freenet/node/Version.java 2006-03-21 22:37:50 UTC (rev
8285)
+++ trunk/freenet/src/freenet/node/Version.java 2006-03-21 23:59:30 UTC (rev
8286)
@@ -20,7 +20,7 @@
public static final String protocolVersion = "1.0";
/** The build number of the current revision */
- private static final int buildNumber = 551;
+ private static final int buildNumber = 552;
/** Oldest build of Fred we will talk to */
private static final int lastGoodBuild = 507;
Modified: trunk/freenet/src/freenet/node/fcp/ClientRequest.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/ClientRequest.java 2006-03-21
22:37:50 UTC (rev 8285)
+++ trunk/freenet/src/freenet/node/fcp/ClientRequest.java 2006-03-21
23:59:30 UTC (rev 8286)
@@ -146,7 +146,9 @@
}
public void cancel() {
- getClientRequest().cancel();
+ ClientRequester cr = getClientRequest();
+ // It might have been finished on startup.
+ if(cr != null) cancel();
}
public boolean isPersistentForever() {
