Repository: openmeetings
Updated Branches:
  refs/heads/master 8a3db428c -> fc50ade04


[OPENMEETINGS-1769] empty messages are not being sent


Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/fc50ade0
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/fc50ade0
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/fc50ade0

Branch: refs/heads/master
Commit: fc50ade045c477e6f84c215fdbc52692df067ebe
Parents: 8a3db42
Author: Maxim Solodovnik <[email protected]>
Authored: Wed Nov 29 13:34:33 2017 +0700
Committer: Maxim Solodovnik <[email protected]>
Committed: Wed Nov 29 13:34:51 2017 +0700

----------------------------------------------------------------------
 .../java/org/apache/openmeetings/web/user/chat/ChatForm.java  | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/openmeetings/blob/fc50ade0/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatForm.java
----------------------------------------------------------------------
diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatForm.java
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatForm.java
index 10c174c..a8401c5 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatForm.java
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatForm.java
@@ -44,6 +44,7 @@ import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.markup.html.form.Form;
 import org.apache.wicket.markup.html.form.HiddenField;
 import org.apache.wicket.model.Model;
+import org.apache.wicket.util.string.Strings;
 import org.red5.logging.Red5LoggerFactory;
 import org.slf4j.Logger;
 
@@ -68,9 +69,13 @@ public class ChatForm extends Form<Void> {
 
                                @Override
                                protected void onSubmit(AjaxRequestTarget 
target) {
+                                       final String txt = 
chatMessage.getDefaultModelObjectAsString();
+                                       if (Strings.isEmpty(txt)) {
+                                               return;
+                                       }
                                        ChatDao dao = getBean(ChatDao.class);
                                        ChatMessage m = new ChatMessage();
-                                       
m.setMessage(chatMessage.getDefaultModelObjectAsString());
+                                       m.setMessage(txt);
                                        m.setSent(new Date());
                                        
m.setFromUser(getBean(UserDao.class).get(getUserId()));
                                        try {

Reply via email to