From 1cf1e62e30bda954d14ac56070b2884a4235c319 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Fri, 16 May 2014 12:07:58 +0200 Subject: fixed null in shared link --- src/eu/siacs/conversations/entities/Conversation.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/eu/siacs/conversations/entities/Conversation.java b/src/eu/siacs/conversations/entities/Conversation.java index 5674f84a..20c70d29 100644 --- a/src/eu/siacs/conversations/entities/Conversation.java +++ b/src/eu/siacs/conversations/entities/Conversation.java @@ -341,7 +341,11 @@ public class Conversation extends AbstractEntity { } public String getNextMessage() { - return this.nextMessage; + if (this.nextMessage==null) { + return ""; + } else { + return this.nextMessage; + } } public void setNextMessage(String message) { -- cgit v1.2.3