From bda2d764a9c187da5aa8cd74fb8c4a9574d3996e Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Fri, 30 Mar 2018 17:52:53 +0300
Subject: xmpp integration tests

---
 juick-server/src/main/java/com/juick/server/CommandsManager.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'juick-server/src/main/java/com/juick/server/CommandsManager.java')

diff --git a/juick-server/src/main/java/com/juick/server/CommandsManager.java b/juick-server/src/main/java/com/juick/server/CommandsManager.java
index 9178dbb9..6458382f 100644
--- a/juick-server/src/main/java/com/juick/server/CommandsManager.java
+++ b/juick-server/src/main/java/com/juick/server/CommandsManager.java
@@ -466,7 +466,7 @@ public class CommandsManager {
             tagService.updateTags(mid, messageTags);
             return CommandResult.fromString("Tags are updated");
         } else {
-            String attachmentType = StringUtils.isNotEmpty(attachment.toString()) ? attachment.toString().substring(attachment.toString().length() - 3) : null;
+            String attachmentType = attachment != null && StringUtils.isNotEmpty(attachment.toString()) ? attachment.toString().substring(attachment.toString().length() - 3) : null;
             int newrid = messagesService.createReply(mid, rid, user.getUid(), txt, attachmentType);
             if (StringUtils.isNotEmpty(attachmentType)) {
                 String attachmentFName = attachment.getScheme().equals("juick") ? attachment.getHost()
-- 
cgit v1.2.3