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 2016/12/14 10:11:45 UTC
svn commit: r1774163 - in /openmeetings/application:
branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/
branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/
trunk/openmeetings-web/src/main/java/org...
Author: solomax
Date: Wed Dec 14 10:11:45 2016
New Revision: 1774163
URL: http://svn.apache.org/viewvc?rev=1774163&view=rev
Log:
[OPENMEETINGS-1454] rights and activities are cleaned up on room exit; code clean-up
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java?rev=1774163&r1=1774162&r2=1774163&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java Wed Dec 14 10:11:45 2016
@@ -339,6 +339,8 @@ public class Application extends Authent
clients.remove(c.getUid());
c.setRoomId(null);
}
+ c.getActivities().clear();
+ c.getRights().clear();
}
return c;
}
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java?rev=1774163&r1=1774162&r2=1774163&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java Wed Dec 14 10:11:45 2016
@@ -415,7 +415,7 @@ public class RoomPanel extends BasePanel
}
}
}
-
+
public static void broadcast(final RoomMessage m) {
WebSocketSettings settings = WebSocketSettings.Holder.get(Application.get());
IWebSocketConnectionRegistry reg = settings.getConnectionRegistry();
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java?rev=1774163&r1=1774162&r2=1774163&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java Wed Dec 14 10:11:45 2016
@@ -339,6 +339,8 @@ public class Application extends Authent
clients.remove(c.getUid());
c.setRoomId(null);
}
+ c.getActivities().clear();
+ c.getRights().clear();
}
return c;
}
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java?rev=1774163&r1=1774162&r2=1774163&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java Wed Dec 14 10:11:45 2016
@@ -418,7 +418,7 @@ public class RoomPanel extends BasePanel
}
}
}
-
+
public static void broadcast(final RoomMessage m) {
WebSocketSettings settings = WebSocketSettings.Holder.get(Application.get());
IWebSocketConnectionRegistry reg = settings.getConnectionRegistry();