Merge branch 'next' into edit-wot-trust

[Sone.git] / src / main / java / net / pterodactylus / sone / template / PostAccessor.java

diff --git a/src/main/java/net/pterodactylus/sone/template/PostAccessor.java b/src/main/java/net/pterodactylus/sone/template/PostAccessor.java
index 746ed25..d5dd406 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/template/PostAccessor.java
+++ b/src/main/java/net/pterodactylus/sone/template/PostAccessor.java
@@ -75,8 +75,14 @@ public class PostAccessor extends ReflectionAccessor {
                        return core.isNewPost(post.getId(), false);
                } else if (member.equals("text")) {
                        String text = post.getText();
+                       if (text == null) {
+                               return null;
+                       }
                        try {
-                               return linkParser.parse(new StringReader(text));
+                               synchronized (linkParser) {
+                                       linkParser.setPostingSone(post.getSone());
+                                       return linkParser.parse(new StringReader(text));
+                               }
                        } catch (IOException ioe1) {
                                /* ignore. */
                        }