[freenet-cvs] r22252 - branches/db4o/freenet/src/freenet/client/async

[t...@freenetproject.org]

Author: toad
Date: 2008-08-30 16:15:50 +0000 (Sat, 30 Aug 2008)
New Revision: 22252

Modified:
   branches/db4o/freenet/src/freenet/client/async/SplitFileFetcherSegment.java
Log:
Fix deadlock: call onSuccess()/onFatalFailure() outside of the lock on (this).


Modified: 
branches/db4o/freenet/src/freenet/client/async/SplitFileFetcherSegment.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/async/SplitFileFetcherSegment.java 
2008-08-30 15:34:45 UTC (rev 22251)
+++ branches/db4o/freenet/src/freenet/client/async/SplitFileFetcherSegment.java 
2008-08-30 16:15:50 UTC (rev 22252)
@@ -1167,16 +1167,20 @@
         * filter twice, resulting in collateral damage to other overlapping 
keys,
         * and then "NOT IN BLOOM FILTER" errors, or worse, false negatives.
         */
-       public synchronized boolean onGotKey(Key key, KeyBlock block, 
ObjectContainer container, ClientContext context) {
+       public boolean onGotKey(Key key, KeyBlock block, ObjectContainer 
container, ClientContext context) {
+               ClientCHKBlock cb;
+               int blockNum;
+               Bucket data;
+               SplitFileFetcherSubSegment seg;
+               synchronized(this) {
                if(finished || startedDecode) {
                        return false;
                }
-               int blockNum = this.getBlockNumber(key, container);
+               blockNum = this.getBlockNumber(key, container);
                if(blockNum < 0) return false;
                ClientCHK ckey = this.getBlockKey(blockNum, container);
-               ClientCHKBlock cb;
                int retryCount = getBlockRetryCount(blockNum);
-               SplitFileFetcherSubSegment seg = this.getSubSegment(retryCount, 
container, true, null);
+               seg = this.getSubSegment(retryCount, container, true, null);
                if(persistent)
                        container.activate(seg, 1);
                if(seg != null) {
@@ -1201,9 +1205,9 @@
                        this.onFatalFailure(new 
FetchException(FetchException.BLOCK_DECODE_ERROR, e), blockNum, null, 
container, context);
                        return false;
                }
-               Bucket data = extract(cb, blockNum, container, context);
+               data = extract(cb, blockNum, container, context);
                if(data == null) return false;
-               
+               }
                if(!cb.isMetadata()) {
                        this.onSuccess(data, blockNum, cb, container, context, 
seg);
                        return true;