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-xmpp/src/main/java/com/juick/components/XMPPConnection.java | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'juick-xmpp/src/main/java/com/juick/components/XMPPConnection.java')

diff --git a/juick-xmpp/src/main/java/com/juick/components/XMPPConnection.java b/juick-xmpp/src/main/java/com/juick/components/XMPPConnection.java
index edf2d0f3..b515ac1c 100644
--- a/juick-xmpp/src/main/java/com/juick/components/XMPPConnection.java
+++ b/juick-xmpp/src/main/java/com/juick/components/XMPPConnection.java
@@ -27,6 +27,7 @@ import com.juick.service.UserService;
 import org.apache.commons.codec.digest.DigestUtils;
 import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;
@@ -292,7 +293,7 @@ public class XMPPConnection implements AutoCloseable {
         if (attachment != null) {
             txt += attachment.getMedium().getUrl() + "\n";
         }
-        txt += jmsg.getText() + "\n\n";
+        txt += StringUtils.defaultString(jmsg.getText()) + "\n\n";
         txt += "#" + jmsg.getMid() + " http://juick.com/" + jmsg.getMid();
 
         Nickname nick = new Nickname("@" + jmsg.getUser().getName());
@@ -335,7 +336,7 @@ public class XMPPConnection implements AutoCloseable {
         if (attachment != null) {
             txt += attachment.getMedium().getUrl() + "\n";
         }
-        txt += jmsg.getText() + "\n\n" + "#" + jmsg.getMid() + "/" + jmsg.getRid() + " http://juick.com/" + jmsg.getMid() + "#" + jmsg.getRid();
+        txt += StringUtils.defaultString(jmsg.getText()) + "\n\n" + "#" + jmsg.getMid() + "/" + jmsg.getRid() + " http://juick.com/" + jmsg.getMid() + "#" + jmsg.getRid();
 
         Message msg = new Message();
         msg.setFrom(bot.getJid());
@@ -362,7 +363,7 @@ public class XMPPConnection implements AutoCloseable {
         if (attachment != null) {
             txt += attachment.getMedium().getUrl() + "\n";
         }
-        txt += jmsg.getText() + "\n\n";
+        txt += StringUtils.defaultString(jmsg.getText()) + "\n\n";
         txt += "#" + jmsg.getMid();
         if (jmsg.getReplies() > 0) {
             if (jmsg.getReplies() % 10 == 1 && jmsg.getReplies() % 100 != 11) {
-- 
cgit v1.2.3