[openmeetings] branch master updated: [OPENMEETINGS-2062] user kick should work better

[solomax]

This is an automated email from the ASF dual-hosted git repository.

solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git


The following commit(s) were added to refs/heads/master by this push:
     new 6aa4756  [OPENMEETINGS-2062] user kick should work better
6aa4756 is described below

commit 6aa4756dad5d0e8f02f0cec85541e37914fc26f7
Author: Maxim Solodovnik <solomax...@gmail.com>
AuthorDate: Fri Apr 26 16:22:30 2019 +0700

    [OPENMEETINGS-2062] user kick should work better
---
 .../src/main/java/org/apache/openmeetings/web/app/Application.java   | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
index 535e6a0..4a618be 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
@@ -375,7 +375,10 @@ public class Application extends 
AuthenticatedWebApplication implements IApplica
        }
 
        public static void kickUser(Client client) {
-               WebSocketHelper.sendRoom(new 
TextRoomMessage(client.getRoom().getId(), client, RoomMessage.Type.kick, 
client.getUid()));
+               if (client != null) {
+                       WebSocketHelper.sendRoom(new 
TextRoomMessage(client.getRoom().getId(), client, RoomMessage.Type.kick, 
client.getUid()));
+                       get().cm.exitRoom(client);
+               }
        }
 
        public static boolean isInvaldSession(String sessionId) {