X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fajax%2FGetPostAjaxPage.java;h=ec0145ab1ba0fa563febfe6f332a1e70a1338577;hb=7bca4bf87205105867893d822f75ab1e00c885b5;hp=452fc5adaa3daf1bd414466c256526fa23ab3dbf;hpb=96fcb6d250349cb1c02df44d6e3acdb93c8e7370;p=Sone.git 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 452fc5a..ec0145a 100644 --- a/src/main/java/net/pterodactylus/sone/web/ajax/GetPostAjaxPage.java +++ b/src/main/java/net/pterodactylus/sone/web/ajax/GetPostAjaxPage.java @@ -46,7 +46,7 @@ public class GetPostAjaxPage extends JsonPage { * The template to render for posts */ public GetPostAjaxPage(WebInterface webInterface, Template postTemplate) { - super("ajax/getPost.ajax", webInterface); + super("getPost.ajax", webInterface); this.postTemplate = postTemplate; } @@ -88,15 +88,18 @@ public class GetPostAjaxPage extends JsonPage { JsonObject jsonPost = new JsonObject(); jsonPost.put("id", post.getId()); 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;