[openmeetings] branch master updated: [OPENMEETINGS-1885] file upload works as expected

[solomax]

This is an automated email from the ASF dual-hosted git repository.

solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git


The following commit(s) were added to refs/heads/master by this push:
     new 29837e0  [OPENMEETINGS-1885] file upload works as expected
29837e0 is described below

commit 29837e0392546723cf42ffe84f2b449f3f8d8370
Author: Maxim Solodovnik <solomax...@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 bf4afdb..27a573a 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
@@ -551,6 +551,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
solo...@apache.org.