[openmeetings] branch 4.0.x updated: [OPENMEETINGS-2055] load file to WB is fixed

[solomax]

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 f8f93fd  [OPENMEETINGS-2055] load file to WB is fixed
f8f93fd is described below

commit f8f93fd073465c28f5c33348170449259862e98d
Author: Maxim Solodovnik <solomax...@gmail.com>
AuthorDate: Wed May 29 11:22:17 2019 +0700

    [OPENMEETINGS-2055] load file to WB is fixed
---
 .../org/apache/openmeetings/web/room/sidebar/UploadDialog.java     | 3 +++
 .../org/apache/openmeetings/web/room/wb/WbWebSocketHelper.java     | 7 +++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/UploadDialog.java
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/UploadDialog.java
index 633e51f..bbd4953 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/UploadDialog.java
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/UploadDialog.java
@@ -55,6 +55,7 @@ import org.apache.wicket.markup.html.form.upload.FileUpload;
 import org.apache.wicket.markup.html.form.upload.FileUploadField;
 import org.apache.wicket.model.IModel;
 import org.apache.wicket.model.Model;
+import org.apache.wicket.request.cycle.RequestCycle;
 import org.apache.wicket.request.resource.JavaScriptResourceReference;
 import org.apache.wicket.util.lang.Bytes;
 import org.apache.wicket.util.string.Strings;
@@ -243,9 +244,11 @@ public class UploadDialog extends 
AbstractFormDialog<String> {
 
                        final Application app = Application.get();
                        final WebSession session = WebSession.get();
+                       final RequestCycle rc = RequestCycle.get();
                        new Thread(() -> {
                                ThreadContext.setApplication(app);
                                ThreadContext.setSession(session);
+                               ThreadContext.setRequestCycle(rc);
                                convertAll();
                                ThreadContext.detach();
                        }).start();
diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbWebSocketHelper.java
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbWebSocketHelper.java
index 552d7e2..f2c271a 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbWebSocketHelper.java
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbWebSocketHelper.java
@@ -33,6 +33,7 @@ import org.apache.openmeetings.web.room.RoomResourceReference;
 import org.apache.openmeetings.web.user.record.Mp4RecordingResourceReference;
 import org.apache.openmeetings.web.user.record.PngRecordingResourceReference;
 import org.apache.wicket.request.cycle.RequestCycle;
+import 
org.apache.wicket.request.handler.resource.ResourceReferenceRequestHandler;
 import org.apache.wicket.request.mapper.parameter.PageParameters;
 import org.apache.wicket.request.resource.ResourceReference;
 import org.apache.wicket.resource.FileSystemResourceReference;
@@ -89,8 +90,10 @@ public class WbWebSocketHelper extends WebSocketHelper {
                return getWbJson(wbId).put(PARAM_OBJ, o);
        }
 
-       private static CharSequence urlFor(final ResourceReference 
resourceReference, PageParameters parameters) {
-               return RequestCycle.get().urlFor(resourceReference, parameters);
+       private static CharSequence urlFor(final ResourceReference ref, 
PageParameters params) {
+               RequestCycle rc = RequestCycle.get();
+               ResourceReferenceRequestHandler handler = new 
ResourceReferenceRequestHandler(ref, params);
+               return 
rc.getUrlRenderer().renderContextRelativeUrl(rc.mapUrlFor(handler).toString());
        }
 
        public static JSONObject addFileUrl(String ruid, JSONObject _file, 
BaseFileItem fi, Client c) {