Author: toad
Date: 2008-06-25 13:35:27 +0000 (Wed, 25 Jun 2008)
New Revision: 20677
Modified:
branches/db4o/freenet/src/freenet/client/async/SingleFileFetcher.java
Log:
More NPEs
Modified: branches/db4o/freenet/src/freenet/client/async/SingleFileFetcher.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/async/SingleFileFetcher.java
2008-06-25 13:32:52 UTC (rev 20676)
+++ branches/db4o/freenet/src/freenet/client/async/SingleFileFetcher.java
2008-06-25 13:35:27 UTC (rev 20677)
@@ -657,15 +657,19 @@
// We are running on the database thread.
// Add a tag, unpack on a separate thread, copy
the data to a persistent bucket, then schedule on the database thread,
// remove the tag, and call the callback.
- container.activate(SingleFileFetcher.this, 1);
- container.activate(ah, 1);
+ if(persistent) {
+
container.activate(SingleFileFetcher.this, 1);
+ container.activate(ah, 1);
+ }
ah.extractPersistentOffThread(result.asBucket(), actx, element, callback,
container, context);
}
}
private void innerSuccess(FetchResult result, ObjectContainer
container, ClientContext context) {
- container.activate(SingleFileFetcher.this, 1);
- container.activate(ah, 1);
+ if(persistent) {
+ container.activate(SingleFileFetcher.this, 1);
+ container.activate(ah, 1);
+ }
try {
ah.extractToCache(result.asBucket(), actx,
element, callback, context.archiveManager, container, context);
} catch (ArchiveFailureException e) {
