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 2018/05/10 14:34:05 UTC
[openmeetings] branch 4.0.x updated: [OPENMEETINGS-1885] file
upload works as expected
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch 4.0.x
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/4.0.x by this push:
new c184963 [OPENMEETINGS-1885] file upload works as expected
c184963 is described below
commit c18496397f208f35fafef02c31b35b8ff96f8953
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Thu May 10 21:33:52 2018 +0700
[OPENMEETINGS-1885] file upload works as expected
---
.../src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.java | 3 +++
1 file changed, 3 insertions(+)
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 02167a0..a819e0b 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
@@ -552,6 +552,9 @@ public class WbPanel extends AbstractWbPanel {
Whiteboards wbs = wbm.get(roomId);
String wuid = UUID.randomUUID().toString();
Whiteboard wb = wbs.get(wbs.getActiveWb());
+ if (wb == null) {
+ return;
+ }
switch (fi.getType()) {
case Folder:
//do nothing
--
To stop receiving notification emails like this one, please contact
solomax@apache.org.