X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FSoneInserter.java;h=86bf049d62a9084e111d1c77bc7579da80e34d51;hb=69bde20c9d91feada988690d3a5a59bc3e086fce;hp=33bc2403a3bcb1dc407048bc5515d1d8ea1cea18;hpb=99b7aae44bab4c7cdb8f1ff58b56b5b25ae239b0;p=Sone.git
diff --git a/src/main/java/net/pterodactylus/sone/core/SoneInserter.java b/src/main/java/net/pterodactylus/sone/core/SoneInserter.java
index 33bc240..86bf049 100644
--- a/src/main/java/net/pterodactylus/sone/core/SoneInserter.java
+++ b/src/main/java/net/pterodactylus/sone/core/SoneInserter.java
@@ -22,6 +22,7 @@ import static java.lang.System.currentTimeMillis;
import static java.util.logging.Logger.getLogger;
import static net.pterodactylus.sone.data.Album.NOT_EMPTY;
+import java.io.Closeable;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.StringWriter;
@@ -29,6 +30,7 @@ import java.nio.charset.Charset;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
+import java.util.Set;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.logging.Level;
import java.util.logging.Logger;
@@ -43,7 +45,6 @@ import net.pterodactylus.sone.data.Post;
import net.pterodactylus.sone.data.Reply;
import net.pterodactylus.sone.data.Sone;
import net.pterodactylus.sone.data.Sone.SoneStatus;
-import net.pterodactylus.sone.freenet.StringBucket;
import net.pterodactylus.sone.main.SonePlugin;
import net.pterodactylus.util.io.Closer;
import net.pterodactylus.util.service.AbstractService;
@@ -57,14 +58,18 @@ import net.pterodactylus.util.template.TemplateParser;
import net.pterodactylus.util.template.XmlFilter;
import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.Charsets;
import com.google.common.base.Optional;
import com.google.common.collect.FluentIterable;
import com.google.common.collect.Ordering;
import com.google.common.eventbus.EventBus;
import com.google.common.eventbus.Subscribe;
-import freenet.client.async.ManifestElement;
import freenet.keys.FreenetURI;
+import freenet.support.api.Bucket;
+import freenet.support.api.ManifestElement;
+import freenet.support.api.RandomAccessBucket;
+import freenet.support.io.ArrayBucket;
/**
* A Sone inserter is responsible for inserting a Sone if it has changed.
@@ -244,6 +249,7 @@ public class SoneInserter extends AbstractService {
eventBus.post(new SoneInsertAbortedEvent(sone, se1));
logger.log(Level.WARNING, String.format("Could not insert Sone â%sâ!", sone.getName()), se1);
} finally {
+ insertInformation.close();
sone.setStatus(SoneStatus.idle);
}
@@ -280,8 +286,10 @@ public class SoneInserter extends AbstractService {
* @author David âBombeâ Roden
*/
@VisibleForTesting
- class InsertInformation {
+ class InsertInformation implements Closeable {
+ /** All properties of the Sone, copied for thread safety. */
+ private final Map soneProperties = new HashMap();
private final String fingerprint;
private final ManifestCreator manifestCreator;
@@ -341,6 +349,11 @@ public class SoneInserter extends AbstractService {
return manifestEntries;
}
+ @Override
+ public void close() {
+ manifestCreator.close();
+ }
+
}
/**
@@ -349,10 +362,11 @@ public class SoneInserter extends AbstractService {
* @author David âBombeâ Roden
*/
@VisibleForTesting
- static class ManifestCreator {
+ static class ManifestCreator implements Closeable {
private final Core core;
private final Map soneProperties;
+ private final Set buckets = new HashSet();
ManifestCreator(Core core, Map soneProperties) {
this.core = core;
@@ -381,19 +395,22 @@ public class SoneInserter extends AbstractService {
templateContext.set("currentEdition", core.getUpdateChecker().getLatestEdition());
templateContext.set("version", SonePlugin.VERSION);
StringWriter writer = new StringWriter();
- StringBucket bucket = null;
try {
template.render(templateContext, writer);
- bucket = new StringBucket(writer.toString(), utf8Charset);
+ RandomAccessBucket bucket = new ArrayBucket(writer.toString().getBytes(Charsets.UTF_8));
+ buckets.add(bucket);
return new ManifestElement(name, bucket, contentType, bucket.size());
} catch (TemplateException te1) {
logger.log(Level.SEVERE, String.format("Could not render template â%sâ!", templateName), te1);
return null;
} finally {
Closer.close(writer);
- if (bucket != null) {
- bucket.free();
- }
+ }
+ }
+
+ public void close() {
+ for (Bucket bucket : buckets) {
+ bucket.free();
}
}