You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2017/11/29 06:34:41 UTC
openmeetings git commit: [OPENMEETINGS-1769] empty messages are not
being sent
Repository: openmeetings
Updated Branches:
refs/heads/4.0.x a65837460 -> f8e195323
[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/f8e19532
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/f8e19532
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/f8e19532
Branch: refs/heads/4.0.x
Commit: f8e1953230a3e5951a012a65c2637c208e59f2a3
Parents: a658374
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Wed Nov 29 13:34:33 2017 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Wed Nov 29 13:34:33 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/f8e19532/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 {