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/07/11 12:46:44 UTC
openmeetings git commit: [OPENMEETINGS-1639] load wb is fixed
Repository: openmeetings
Updated Branches:
refs/heads/master 721dbb23f -> 17f3204a8
[OPENMEETINGS-1639] load wb is fixed
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/17f3204a
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/17f3204a
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/17f3204a
Branch: refs/heads/master
Commit: 17f3204a8a8aa8553bdf2deb97646537c4a325f7
Parents: 721dbb2
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Tue Jul 11 19:46:36 2017 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Tue Jul 11 19:46:36 2017 +0700
----------------------------------------------------------------------
.../main/java/org/apache/openmeetings/web/room/wb/WbPanel.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/17f3204a/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 d542e45..15cf74e 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
@@ -495,7 +495,10 @@ public class WbPanel extends Panel {
File f = fi.getFile();
if (f.exists() && f.isFile()) {
try (BufferedReader br = Files.newBufferedReader(f.toPath())) {
- JSONArray arr = getArray(new JSONObject(new JSONTokener(br)), (o) -> addFileUrl(wbs.getUid(), o));
+ JSONArray arr = getArray(new JSONObject(new JSONTokener(br)), (o) -> {
+ wb.getRoomItems().put(o.getString("uid"), o);
+ return addFileUrl(wbs.getUid(), o);
+ });
sendWbAll(Action.load, getObjWbJson(wb.getId(), arr));
} catch (Exception e) {
log.error("Unexpected error while loading WB", e);