Author: nextgens
Date: 2009-02-14 16:10:42 +0000 (Sat, 14 Feb 2009)
New Revision: 25652
Modified:
trunk/freenet/
trunk/freenet/src/freenet/node/Node.java
Log:
backport of r25594 (Fix turtle)
Property changes on: trunk/freenet
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/db4o/freenet:24785,25282,25332,25479,25488,25540
+ /branches/db4o:25594
/branches/db4o/freenet:24785,25282,25332,25479,25488,25540,25594
Modified: trunk/freenet/src/freenet/node/Node.java
===================================================================
--- trunk/freenet/src/freenet/node/Node.java 2009-02-14 16:10:08 UTC (rev
25651)
+++ trunk/freenet/src/freenet/node/Node.java 2009-02-14 16:10:42 UTC (rev
25652)
@@ -3980,6 +3980,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
