From 62df283157ff32dded77e833fbd0f4e3007acbbe Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Wed, 17 Jan 2018 13:33:50 +0300
Subject: prevent nulls with StringUtils.defaultString()

---
 juick-www/src/main/java/com/juick/www/controllers/NewMessage.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'juick-www/src/main/java/com/juick/www')

diff --git a/juick-www/src/main/java/com/juick/www/controllers/NewMessage.java b/juick-www/src/main/java/com/juick/www/controllers/NewMessage.java
index 9e022557..ea81b5e0 100644
--- a/juick-www/src/main/java/com/juick/www/controllers/NewMessage.java
+++ b/juick-www/src/main/java/com/juick/www/controllers/NewMessage.java
@@ -254,7 +254,8 @@ public class NewMessage {
         com.juick.Message jmsg = messagesService.getReply(mid, ridnew);
         xmsg.addExtension(jmsg);
 
-        String quote = reply != null ? reply.getText() : msg.getText();
+        String quote = reply != null ? StringUtils.defaultString(reply.getText())
+                : StringUtils.defaultString(msg.getText());
         if (quote.length() >= 50) {
             quote = quote.substring(0, 47) + "...";
         }
-- 
cgit v1.2.3