Author: toad
Date: 2008-12-18 21:51:35 +0000 (Thu, 18 Dec 2008)
New Revision: 24532
Modified:
branches/db4o/freenet/src/freenet/client/async/SplitFileFetcherSegment.java
Log:
That's not the right way - freeDecodedData should assume there is something...
Modified:
branches/db4o/freenet/src/freenet/client/async/SplitFileFetcherSegment.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/async/SplitFileFetcherSegment.java
2008-12-18 21:50:30 UTC (rev 24531)
+++ branches/db4o/freenet/src/freenet/client/async/SplitFileFetcherSegment.java
2008-12-18 21:51:35 UTC (rev 24532)
@@ -1425,20 +1425,19 @@
}
public void freeDecodedData(ObjectContainer container) {
- if(decodedData != null) {
- if(persistent)
- container.activate(decodedData, 1);
- decodedData.free();
- if(persistent)
- decodedData.removeFrom(container);
- }
+ if(persistent)
+ container.activate(decodedData, 1);
+ decodedData.free();
+ if(persistent)
+ decodedData.removeFrom(container);
decodedData = null;
if(persistent)
container.store(this);
}
public void removeFrom(ObjectContainer container, ClientContext
context) {
- freeDecodedData(container);
+ if(decodedData != null)
+ freeDecodedData(container);
removeSubSegments(container, context);
for(int i=0;i<dataKeys.length;i++) {
if(dataKeys[i] != null)
dataKeys[i].removeFrom(container);
_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
