Repository: openmeetings Updated Branches: refs/heads/3.3.x 64e4e621e -> e9ab87315
[OPENMEETINGS-1677] build is fixed Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/e9ab8731 Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/e9ab8731 Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/e9ab8731 Branch: refs/heads/3.3.x Commit: e9ab873152a52c89d4d8ce502c3214819b7214f8 Parents: 64e4e62 Author: Maxim Solodovnik <solomax...@gmail.com> Authored: Tue Aug 8 14:05:24 2017 +0700 Committer: Maxim Solodovnik <solomax...@gmail.com> Committed: Tue Aug 8 14:05:24 2017 +0700 ---------------------------------------------------------------------- .../apache/openmeetings/web/room/menu/StartSharingButton.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/e9ab8731/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/StartSharingButton.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/StartSharingButton.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/StartSharingButton.java index 3867f66..658650d 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/StartSharingButton.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/StartSharingButton.java @@ -49,11 +49,11 @@ import org.apache.openmeetings.util.OmFileHelper; import org.apache.openmeetings.web.app.Application; import org.apache.openmeetings.web.app.WebSession; import org.apache.openmeetings.web.common.OmButton; +import org.apache.wicket.ajax.AjaxRequestTarget; +import org.apache.wicket.behavior.AttributeAppender; import org.apache.wicket.extensions.ajax.AjaxDownload; import org.apache.wicket.request.resource.ResourceStreamResource; import org.apache.wicket.util.resource.IResourceStream; -import org.apache.wicket.ajax.AjaxRequestTarget; -import org.apache.wicket.behavior.AttributeAppender; import org.apache.wicket.util.resource.StringResourceStream; import org.apache.wicket.util.string.Strings; import org.red5.logging.Red5LoggerFactory; @@ -103,6 +103,7 @@ public class StartSharingButton extends OmButton { try (InputStream jnlp = getClass().getClassLoader().getResourceAsStream("APPLICATION.jnlp")) { ConfigurationDao cfgDao = getBean(ConfigurationDao.class); app = IOUtils.toString(jnlp, UTF_8); + Client c = getOnlineClient(uid); String publicSid = c.getUid(); StreamClient rc = getClient(publicSid); if (rc == null || rc.getUserId() == null) { @@ -110,7 +111,6 @@ public class StartSharingButton extends OmButton { } String _url = rc.getTcUrl(); URI url = new URI(_url); - Client c = getOnlineClient(uid); long roomId = c.getRoomId(); Room room = getBean(RoomDao.class).get(roomId); ISessionManager sessionManager = getBean(ISessionManager.class);
