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/08/31 08:50:05 UTC
openmeetings git commit: [OPENMEETINGS-1677] room exit is fixed
Repository: openmeetings
Updated Branches:
refs/heads/3.3.x d21908da8 -> 79fc2e2f1
[OPENMEETINGS-1677] room exit is fixed
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/79fc2e2f
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/79fc2e2f
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/79fc2e2f
Branch: refs/heads/3.3.x
Commit: 79fc2e2f1e205f6dafc402d806c5f8c7c40614f8
Parents: d21908d
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Thu Aug 31 15:49:58 2017 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Thu Aug 31 15:49:58 2017 +0700
----------------------------------------------------------------------
.../main/java/org/apache/openmeetings/db/entity/room/Room.java | 5 +++++
.../main/java/org/apache/openmeetings/web/app/Application.java | 5 ++++-
2 files changed, 9 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/79fc2e2f/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java
----------------------------------------------------------------------
diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java
index cdaa898..b09ae13 100644
--- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java
+++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java
@@ -582,4 +582,9 @@ public class Room implements IDataProviderEntity {
public void setPin(String pin) {
this.pin = pin;
}
+
+ @Override
+ public String toString() {
+ return "Room [id=" + id + ", name=" + name + ", type=" + type + "]";
+ }
}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/79fc2e2f/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
----------------------------------------------------------------------
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 e16b8ec..4328134 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
@@ -586,11 +586,14 @@ public class Application extends AuthenticatedWebApplication implements IApplica
Long roomId = c.getRoomId();
log.debug("Removing online room client: {}, room: {}", c.getUid(), roomId);
if (roomId != null) {
- Set<String> clients = get().getRooms().get(roomId);
+ Map<Long, Set<String>> rooms = get().getRooms();
+ Set<String> clients = rooms.get(roomId);
if (clients != null) {
clients.remove(c.getUid());
+ rooms.put(roomId, clients);
}
getBean(ScopeApplicationAdapter.class).roomLeaveByScope(c.getUid(), roomId);
+ c.setRoomId(null);
c.clearActivities();
c.clearRights();
update(c);