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/01/22 13:56:08 UTC
svn commit: r1726201 - in /openmeetings/application:
branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/
branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/
trunk/openmeetings-db/src/main...
Author: solomax
Date: Fri Jan 22 12:56:08 2016
New Revision: 1726201
URL: http://svn.apache.org/viewvc?rev=1726201&view=rev
Log:
Room enter hang is fixed
Modified:
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MainService.java
openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java
Modified: openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MainService.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MainService.java?rev=1726201&r1=1726200&r2=1726201&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MainService.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MainService.java Fri Jan 22 12:56:08 2016
@@ -188,7 +188,7 @@ public class MainService implements IPen
} else {
allowed = r.getIspublic() || (r.getOwnerId() != null && r.getOwnerId().equals(userId));
log.debug("[loginWicket] public ? " + r.getIspublic() + ", ownedId ? " + r.getOwnerId() + " " + allowed);
- if (!allowed) {
+ if (!allowed && null != r.getRoomGroups()) {
for (RoomGroup ro : r.getRoomGroups()) {
for (GroupUser ou : u.getGroupUsers()) {
if (ro.getGroup().getId().equals(ou.getGroup().getId())) {
Modified: openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java?rev=1726201&r1=1726200&r2=1726201&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java Fri Jan 22 12:56:08 2016
@@ -298,7 +298,7 @@ public class Room implements IDataProvid
@JoinColumn(name = "room_id", insertable = true, updatable = true)
@ElementDependent
@org.simpleframework.xml.Transient
- private List<RoomGroup> roomGroups = new ArrayList<RoomGroup>();
+ private List<RoomGroup> roomGroups = new ArrayList<>();
@Transient
private List<Client> currentusers;
Modified: openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java?rev=1726201&r1=1726200&r2=1726201&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java (original)
+++ openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java Fri Jan 22 12:56:08 2016
@@ -298,7 +298,7 @@ public class Room implements IDataProvid
@JoinColumn(name = "room_id", insertable = true, updatable = true)
@ElementDependent
@org.simpleframework.xml.Transient
- private List<RoomGroup> roomGroups = new ArrayList<RoomGroup>();
+ private List<RoomGroup> roomGroups = new ArrayList<>();
@Transient
private List<Client> currentusers;