Author: toad
Date: 2009-01-23 21:13:34 +0000 (Fri, 23 Jan 2009)
New Revision: 25254
Modified:
branches/db4o/freenet/src/freenet/client/async/BaseSingleFileFetcher.java
branches/db4o/freenet/src/freenet/client/async/SingleFileFetcher.java
Log:
Activation NPE
Modified:
branches/db4o/freenet/src/freenet/client/async/BaseSingleFileFetcher.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/async/BaseSingleFileFetcher.java
2009-01-23 20:32:24 UTC (rev 25253)
+++ branches/db4o/freenet/src/freenet/client/async/BaseSingleFileFetcher.java
2009-01-23 21:13:34 UTC (rev 25254)
@@ -118,10 +118,12 @@
unregister(container, context);
}
} else {
+ unregister(container, context);
reschedule(container, context);
}
return true; // We will retry in any case, maybe not
just not yet. See requeueAfterCooldown(Key).
}
+ unregister(container, context);
return false;
}
Modified: branches/db4o/freenet/src/freenet/client/async/SingleFileFetcher.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/async/SingleFileFetcher.java
2009-01-23 20:32:24 UTC (rev 25253)
+++ branches/db4o/freenet/src/freenet/client/async/SingleFileFetcher.java
2009-01-23 21:13:34 UTC (rev 25254)
@@ -892,9 +892,17 @@
}
public void onExpectedSize(long size, ObjectContainer
container) {
+ boolean wasActive = true;
+ if(persistent) {
+ wasActive =
container.ext().isActive(SingleFileFetcher.this);
+ if(!wasActive)
+
container.activate(SingleFileFetcher.this, 1);
+ }
if(persistent)
container.activate(rcb, 1);
rcb.onExpectedSize(size, container);
+ if(!wasActive)
+ container.deactivate(SingleFileFetcher.this, 1);
}
public void onFinalizedMetadata(ObjectContainer container) {
_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
