Repository: openmeetings Updated Branches: refs/heads/master 92e2d79dd -> ec58c4826
[OPENMEETINGS-1714] more issues are fixed Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/ec58c482 Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/ec58c482 Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/ec58c482 Branch: refs/heads/master Commit: ec58c48265cbb7d7035ac3ee7d1a42396954ad35 Parents: 92e2d79 Author: Maxim Solodovnik <[email protected]> Authored: Fri Oct 13 23:34:11 2017 +0700 Committer: Maxim Solodovnik <[email protected]> Committed: Fri Oct 13 23:34:11 2017 +0700 ---------------------------------------------------------------------- .../java/org/apache/openmeetings/web/room/wb/WbPanel.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/ec58c482/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.java index 32cdeac..94e050e 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.java @@ -170,8 +170,8 @@ public class WbPanel extends AbstractWbPanel { @Override void internalWbLoad(StringBuilder sb) { if (!WhiteboardCache.contains(roomId) && rp.getRoom().getFiles() != null && !rp.getRoom().getFiles().isEmpty()) { - try { - if (WhiteboardCache.tryLock(roomId)) { + if (WhiteboardCache.tryLock(roomId)) { + try { TreeMap<Long, List<BaseFileItem>> files = new TreeMap<>(); for (RoomFile rf : rp.getRoom().getFiles()) { List<BaseFileItem> bfl = files.get(rf.getWbIdx()); @@ -189,9 +189,9 @@ public class WbPanel extends AbstractWbPanel { sendFileToWb(fi, false); } } + } finally { + WhiteboardCache.unlock(roomId); } - } finally { - WhiteboardCache.unlock(roomId); } } Whiteboards wbs = WhiteboardCache.get(roomId);
