Author: toad
Date: 2009-02-12 14:18:27 +0000 (Thu, 12 Feb 2009)
New Revision: 25594
Modified:
branches/db4o/freenet/src/freenet/node/Node.java
Log:
Fix turtle NPE. REQUEST BACKPORT.
Modified: branches/db4o/freenet/src/freenet/node/Node.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/Node.java 2009-02-12 14:17:42 UTC
(rev 25593)
+++ branches/db4o/freenet/src/freenet/node/Node.java 2009-02-12 14:18:27 UTC
(rev 25594)
@@ -4099,6 +4099,10 @@
return;
}
PeerNode from = sender.transferringFrom();
+ if(from == null) {
+ // Race condition, it has finished, avoid NPE
+ return;
+ }
if(!from.registerTurtleTransfer(sender)) {
// Too many turtles running, or already a turtle for
this key.
// Abort it.
_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
