Author: j16sdiz
Date: 2008-12-20 15:56:12 +0000 (Sat, 20 Dec 2008)
New Revision: 24673
Modified:
trunk/freenet/src/freenet/client/async/SplitFileFetcher.java
Log:
Revert "yet another leak that prevent plugin unload", this break compile
Modified: trunk/freenet/src/freenet/client/async/SplitFileFetcher.java
===================================================================
--- trunk/freenet/src/freenet/client/async/SplitFileFetcher.java
2008-12-20 15:53:40 UTC (rev 24672)
+++ trunk/freenet/src/freenet/client/async/SplitFileFetcher.java
2008-12-20 15:56:12 UTC (rev 24673)
@@ -5,7 +5,6 @@
import java.io.IOException;
import java.io.OutputStream;
-import java.lang.ref.WeakReference;
import java.util.LinkedList;
import freenet.client.ArchiveContext;
@@ -34,7 +33,7 @@
final ArchiveContext archiveContext;
final LinkedList decompressors;
final ClientMetadata clientMetadata;
- final WeakReference<ClientRequester> parent;
+ final ClientRequester parent;
final GetCompletionCallback cb;
final int recursionLevel;
/** The splitfile type. See the SPLITFILE_ constants on Metadata. */
@@ -69,7 +68,7 @@
this.clientMetadata = clientMetadata;
this.cb = rcb;
this.recursionLevel = recursionLevel + 1;
- this.parent = new WeakReference<ClientRequester>(parent2);
+ this.parent = parent2;
if(parent2.isCancelled())
throw new FetchException(FetchException.CANCELLED);
overrideLength = metadata.dataLength();
@@ -167,9 +166,8 @@
throw new
FetchException(FetchException.INVALID_METADATA, "Unable to allocate all check
blocks to segments - buggy or malicious inserter");
}
this.token = token2;
-
- parent2.addBlocks(splitfileDataBlocks.length +
splitfileCheckBlocks.length);
- parent2.addMustSucceedBlocks(splitfileDataBlocks.length);
+ parent.addBlocks(splitfileDataBlocks.length +
splitfileCheckBlocks.length);
+ parent.addMustSucceedBlocks(splitfileDataBlocks.length);
}
/** Return the final status of the fetch. Throws an exception, or
returns a
@@ -304,11 +302,7 @@
}
public void scheduleOffThread() {
- ClientRequester p = parent.get();
- if (p == null)
- return;
-
- fetchContext.slowSerialExecutor[p.priorityClass].execute(new
Runnable() {
+
fetchContext.slowSerialExecutor[parent.priorityClass].execute(new Runnable() {
public void run() {
schedule();
}
_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
