[openmeetings] branch master updated: [OPENMEETINGS-2337] bootstrap goes first, minor NPE issue is fixed

[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 7d2a4f8  [OPENMEETINGS-2337] bootstrap goes first, minor NPE issue is 
fixed
7d2a4f8 is described below

commit 7d2a4f859f8dc27fd7ce6876c9b02ea40511d15a
Author: Maxim Solodovnik <solomax...@gmail.com>
AuthorDate: Sun May 3 00:33:35 2020 +0700

    [OPENMEETINGS-2337] bootstrap goes first, minor NPE issue is fixed
---
 .../java/org/apache/openmeetings/core/remote/StreamProcessor.java | 3 +++
 .../main/java/org/apache/openmeetings/web/common/MainPanel.java   | 8 ++++++++
 2 files changed, 11 insertions(+)

diff --git 
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/StreamProcessor.java
 
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/StreamProcessor.java
index caceb36..4fa49fe 100644
--- 
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/StreamProcessor.java
+++ 
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/StreamProcessor.java
@@ -128,6 +128,9 @@ public class StreamProcessor implements IStreamProcessor {
                                if (sender != null) {
                                        Client sendClient = 
cm.getBySid(sender.getSid());
                                        sd = 
sendClient.getStream(sender.getUid());
+                                       if (sd == null) {
+                                               break;
+                                       }
                                        if (StreamType.SCREEN == sd.getType() 
&& sd.hasActivity(Activity.RECORD) && !sd.hasActivity(Activity.SCREEN)) {
                                                break;
                                        }
diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java
index cd0b90b..ed16515 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java
@@ -72,6 +72,7 @@ import org.apache.wicket.ajax.markup.html.AjaxLink;
 import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
 import org.apache.wicket.devutils.debugbar.DebugBar;
 import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.markup.head.JavaScriptHeaderItem;
 import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
 import org.apache.wicket.markup.head.PriorityHeaderItem;
 import org.apache.wicket.markup.html.WebMarkupContainer;
@@ -89,6 +90,7 @@ import org.wicketstuff.urlfragment.UrlFragment;
 import com.github.openjson.JSONObject;
 
 import 
de.agilecoders.wicket.core.markup.html.bootstrap.navbar.INavbarComponent;
+import 
de.agilecoders.wicket.core.markup.html.references.BootstrapJavaScriptReference;
 
 public class MainPanel extends Panel {
        private static final long serialVersionUID = 1L;
@@ -291,6 +293,12 @@ public class MainPanel extends Panel {
                topLinks.add(logout);
        }
 
+       @Override
+       public void renderHead(IHeaderResponse response) {
+               response.render(new 
PriorityHeaderItem(JavaScriptHeaderItem.forReference(BootstrapJavaScriptReference.instance())));
 //this one should go before jquery-ui
+               super.renderHead(response);
+       }
+
        private OmMenuItem getSubItem(String lbl, String title, MenuActions 
action) {
                return new MainMenuItem(lbl, title, action) {
                        private static final long serialVersionUID = 1L;