[freenet-cvs] r18143 - trunk/freenet/src/freenet/client/async

[t...@freenetproject.org]

Author: toad
Date: 2008-02-23 22:12:10 +0000 (Sat, 23 Feb 2008)
New Revision: 18143

Modified:
   trunk/freenet/src/freenet/client/async/SplitFileFetcherSubSegment.java
Log:
Don't set cancelled if we're not actually removing.

Modified: trunk/freenet/src/freenet/client/async/SplitFileFetcherSubSegment.java
===================================================================
--- trunk/freenet/src/freenet/client/async/SplitFileFetcherSubSegment.java      
2008-02-23 21:31:35 UTC (rev 18142)
+++ trunk/freenet/src/freenet/client/async/SplitFileFetcherSubSegment.java      
2008-02-23 22:12:10 UTC (rev 18143)
@@ -316,9 +316,11 @@
                        if(!blockNums.isEmpty()) return;
                        if(logMINOR)
                                Logger.minor(this, "Definitely removing from 
parent: "+this);
+               }
+               if(!segment.maybeRemoveSeg(this)) return;
+               synchronized(this) {
                        cancelled = true;
                }
-               if(!segment.maybeRemoveSeg(this)) return;
                unregister();
        }