svn commit: r1696889 - in /openmeetings/branches/3.0.x/src: main/java/org/apache/openmeetings/remote/UserService.java web/java/org/apache/openmeetings/web/app/Application.java

[vdegtyarev]

Author: vdegtyarev
Date: Fri Aug 21 03:45:00 2015
New Revision: 1696889

URL: http://svn.apache.org/r1696889
Log:
OPENMEETINGS-1125 minor changes.

Modified:
    
openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/remote/UserService.java
    
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/app/Application.java

Modified: 
openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/remote/UserService.java
URL: 
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/remote/UserService.java?rev=1696889&r1=1696888&r2=1696889&view=diff
==============================================================================
--- 
openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/remote/UserService.java
 (original)
+++ 
openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/remote/UserService.java
 Fri Aug 21 03:45:00 2015
@@ -21,7 +21,6 @@ package org.apache.openmeetings.remote;
 import static 
org.apache.openmeetings.db.entity.user.PrivateMessage.INBOX_FOLDER_ID;
 import static 
org.apache.openmeetings.db.entity.user.PrivateMessage.SENT_FOLDER_ID;
 import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
-import static org.apache.openmeetings.web.app.Application.removeOnlineUser;
 
 import java.util.ArrayList;
 import java.util.Calendar;
@@ -513,7 +512,7 @@ public class UserService implements IUse
                        if 
(AuthLevelUtil.hasAdminLevel(userDao.getRights(users_id))) {
                                WebClient client = 
Application.getClientByKeys(userId, sessionId);
                                if (client != null) {
-                                       removeOnlineUser(client);
+                                       Application.invalidateClient(client);
                                }
                        }
                } catch (Exception err) {

Modified: 
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/app/Application.java
URL: 
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/app/Application.java?rev=1696889&r1=1696888&r2=1696889&view=diff
==============================================================================
--- 
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/app/Application.java
 (original)
+++ 
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/app/Application.java
 Fri Aug 21 03:45:00 2015
@@ -204,7 +204,6 @@ public class Application extends Authent
                try {
                        if (c != null) {
                                ONLINE_USERS.remove(c.getUserId(), 
c.getSessionId());
-                               invalidateClient(c);
                        }
                } catch (Exception err) {
                        log.error("[removeOnlineUser]", err);
@@ -240,6 +239,7 @@ public class Application extends Authent
        public static void invalidateClient(WebClient client) {
                if (!INVALID_SESSIONS.containsKey(client.getSessionId())) {
                        INVALID_SESSIONS.put(client.getSessionId(), client);
+                       removeOnlineUser(client);
                }
        }