Repository: openmeetings
Updated Branches:
  refs/heads/master ea524d3af -> c6646f189


no jira: minor fix on room enter by hash


Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/c6646f18
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/c6646f18
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/c6646f18

Branch: refs/heads/master
Commit: c6646f1893b27c1f0ae0ad684a3d068b0e6dfb60
Parents: ea524d3
Author: Maxim Solodovnik <solomax...@gmail.com>
Authored: Thu Aug 10 15:08:25 2017 +0700
Committer: Maxim Solodovnik <solomax...@gmail.com>
Committed: Thu Aug 10 15:08:25 2017 +0700

----------------------------------------------------------------------
 .../main/java/org/apache/openmeetings/web/pages/HashPage.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/openmeetings/blob/c6646f18/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/HashPage.java
----------------------------------------------------------------------
diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/HashPage.java
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/HashPage.java
index 8e4f8c6..eba4438 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/HashPage.java
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/HashPage.java
@@ -81,7 +81,7 @@ public class HashPage extends BaseInitedPage implements 
IUpdatable {
                getHeader().setVisible(false);
                // need to re-fetch Room object to initialize all collections
                Room room = getBean(RoomDao.class).get(roomId);
-               if (room != null) {
+               if (room != null && !room.isDeleted()) {
                        rp = new RoomPanel(CHILD_ID, room);
                        mp = new MainPanel(PANEL_MAIN, rp);
                        replace(mp);
@@ -118,7 +118,7 @@ public class HashPage extends BaseInitedPage implements 
IUpdatable {
                                        error = false;
                                }
                                Room r = i.getRoom();
-                               if (r != null) {
+                               if (r != null && !r.isDeleted()) {
                                        createRoom(r.getId());
                                        if (i.isPasswordProtected() && rp != 
null) {
                                                mp.getChat().setVisible(false);

Reply via email to