Author: j16sdiz
Date: 2008-11-23 10:15:38 +0000 (Sun, 23 Nov 2008)
New Revision: 23825
Modified:
trunk/freenet/src/freenet/client/HighLevelSimpleClientImpl.java
trunk/freenet/src/freenet/client/async/ClientRequestScheduler.java
Log:
quick workaround for bug 2728
the real fix is in db4o branch
Modified: trunk/freenet/src/freenet/client/HighLevelSimpleClientImpl.java
===================================================================
--- trunk/freenet/src/freenet/client/HighLevelSimpleClientImpl.java
2008-11-23 10:15:15 UTC (rev 23824)
+++ trunk/freenet/src/freenet/client/HighLevelSimpleClientImpl.java
2008-11-23 10:15:38 UTC (rev 23825)
@@ -266,7 +266,6 @@
ctx.allowedMIMETypes = allowedTypes;
final ClientGetter get = new ClientGetter(nullCallback,
core.requestStarters.chkFetchScheduler, core.requestStarters.sskFetchScheduler,
uri, ctx, RequestStarter.PREFETCH_PRIORITY_CLASS, this, new NullBucket(), null);
ctx.ticker.queueTimedJob(new Runnable() {
-
public void run() {
get.cancel();
}
Modified: trunk/freenet/src/freenet/client/async/ClientRequestScheduler.java
===================================================================
--- trunk/freenet/src/freenet/client/async/ClientRequestScheduler.java
2008-11-23 10:15:15 UTC (rev 23824)
+++ trunk/freenet/src/freenet/client/async/ClientRequestScheduler.java
2008-11-23 10:15:38 UTC (rev 23825)
@@ -7,6 +7,8 @@
import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedList;
+import java.util.Map;
+import java.util.WeakHashMap;
import freenet.config.EnumerableOptionCallback;
import freenet.config.InvalidConfigValueException;
@@ -90,7 +92,7 @@
final boolean isInsertScheduler;
final boolean isSSKScheduler;
final RandomSource random;
- private final HashMap<ClientRequester, HashSet<SendableRequest>>
allRequestsByClientRequest;
+ private final Map<ClientRequester, HashSet<SendableRequest>>
allRequestsByClientRequest;
private final RequestStarter starter;
private final Node node;
public final String name;
@@ -165,7 +167,7 @@
this.isInsertScheduler = forInserts;
this.isSSKScheduler = forSSKs;
priorities = new
SortedVectorByNumber[RequestStarter.NUMBER_OF_PRIORITY_CLASSES];
- allRequestsByClientRequest = new HashMap<ClientRequester,
HashSet<SendableRequest>>();
+ allRequestsByClientRequest = new WeakHashMap<ClientRequester,
HashSet<SendableRequest>>();
if(forInserts)
pendingKeys = null;
else
_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
