From: David ‘Bombe’ Roden <bombe@pterodactylus.net>
Date: Sun, 12 Dec 2010 16:25:23 +0000 (+0100)
Subject: Merge branch 'release-0.3.4'
X-Git-Tag: 0.3.4^0
X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=commitdiff_plain;h=7bca4bf87205105867893d822f75ab1e00c885b5;hp=b8c96f32a65f1df01edeb9bd4a4a66c8726ba2dd

Merge branch 'release-0.3.4'
---

diff --git a/pom.xml b/pom.xml
index ba13bd4..4024519 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>net.pterodactylus</groupId>
 	<artifactId>sone</artifactId>
-	<version>0.3.3</version>
+	<version>0.3.4</version>
 	<dependencies>
 		<dependency>
 			<groupId>net.pterodactylus</groupId>
diff --git a/src/main/java/net/pterodactylus/sone/main/SonePlugin.java b/src/main/java/net/pterodactylus/sone/main/SonePlugin.java
index 130ce11..ae7c9d2 100644
--- a/src/main/java/net/pterodactylus/sone/main/SonePlugin.java
+++ b/src/main/java/net/pterodactylus/sone/main/SonePlugin.java
@@ -79,7 +79,7 @@ public class SonePlugin implements FredPlugin, FredPluginL10n, FredPluginBaseL10
 	}
 
 	/** The version. */
-	public static final Version VERSION = new Version(0, 3, 3);
+	public static final Version VERSION = new Version(0, 3, 4);
 
 	/** The logger. */
 	private static final Logger logger = Logging.getLogger(SonePlugin.class);
diff --git a/src/main/java/net/pterodactylus/sone/web/ajax/GetPostAjaxPage.java b/src/main/java/net/pterodactylus/sone/web/ajax/GetPostAjaxPage.java
index 7c96d56..ec0145a 100644
--- a/src/main/java/net/pterodactylus/sone/web/ajax/GetPostAjaxPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/ajax/GetPostAjaxPage.java
@@ -90,14 +90,16 @@ public class GetPostAjaxPage extends JsonPage {
 		jsonPost.put("sone", post.getSone().getId());
 		jsonPost.put("recipient", (post.getRecipient() == null) ? null : post.getRecipient().getId());
 		jsonPost.put("time", post.getTime());
-		postTemplate.set("post", post);
 		StringWriter stringWriter = new StringWriter();
-		try {
-			postTemplate.render(stringWriter);
-		} catch (TemplateException te1) {
-			/* TODO - shouldn’t happen. */
-		} finally {
-			Closer.close(stringWriter);
+		synchronized (postTemplate) {
+			postTemplate.set("post", post);
+			try {
+				postTemplate.render(stringWriter);
+			} catch (TemplateException te1) {
+				/* TODO - shouldn’t happen. */
+			} finally {
+				Closer.close(stringWriter);
+			}
 		}
 		jsonPost.put("html", stringWriter.toString());
 		return jsonPost;
diff --git a/src/main/java/net/pterodactylus/sone/web/ajax/GetReplyAjaxPage.java b/src/main/java/net/pterodactylus/sone/web/ajax/GetReplyAjaxPage.java
index 77b3ada..0963b09 100644
--- a/src/main/java/net/pterodactylus/sone/web/ajax/GetReplyAjaxPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/ajax/GetReplyAjaxPage.java
@@ -92,14 +92,16 @@ public class GetReplyAjaxPage extends JsonPage {
 		jsonReply.put("postId", reply.getPost().getId());
 		jsonReply.put("soneId", reply.getSone().getId());
 		jsonReply.put("time", reply.getTime());
-		replyTemplate.set("reply", reply);
 		StringWriter stringWriter = new StringWriter();
-		try {
-			replyTemplate.render(stringWriter);
-		} catch (TemplateException te1) {
-			/* TODO - shouldn’t happen. */
-		} finally {
-			Closer.close(stringWriter);
+		synchronized (replyTemplate) {
+			replyTemplate.set("reply", reply);
+			try {
+				replyTemplate.render(stringWriter);
+			} catch (TemplateException te1) {
+				/* TODO - shouldn’t happen. */
+			} finally {
+				Closer.close(stringWriter);
+			}
 		}
 		return jsonReply.put("html", stringWriter.toString());
 	}