Author: toad
Date: 2009-03-17 15:33:07 +0000 (Tue, 17 Mar 2009)
New Revision: 26065
Modified:
branches/db4o/freenet/src/freenet/node/fcp/ClientPutDir.java
Log:
Fix NPE in freeData()
Modified: branches/db4o/freenet/src/freenet/node/fcp/ClientPutDir.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/fcp/ClientPutDir.java
2009-03-17 15:19:42 UTC (rev 26064)
+++ branches/db4o/freenet/src/freenet/node/fcp/ClientPutDir.java
2009-03-17 15:33:07 UTC (rev 26065)
@@ -288,12 +288,14 @@
Iterator i = manifestElements.values().iterator();
while(i.hasNext()) {
Object o = i.next();
+ if(persistenceType == PERSIST_FOREVER)
+ container.activate(o, 1);
if(o instanceof HashMap)
freeData((HashMap<String, Object>) o,
container);
else {
ManifestElement e = (ManifestElement) o;
+ if(logMINOR) Logger.minor(this, "Freeing "+e);
e.freeData(container, persistenceType ==
PERSIST_FOREVER);
- if(logMINOR) Logger.minor(this, "Freeing "+e);
}
}
container.delete(manifestElements);
_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
