[openmeetings] branch master updated: [OPENMEETINGS-1962] conference room is more stable

[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 f2d9136  [OPENMEETINGS-1962] conference room is more stable
f2d9136 is described below

commit f2d91360b0dbaf1480126c98893c6fe7a96d1c48
Author: Maxim Solodovnik <solomax...@gmail.com>
AuthorDate: Tue Oct 30 22:35:33 2018 +0700

    [OPENMEETINGS-1962] conference room is more stable
---
 .../org/apache/openmeetings/core/ldap/LdapLoginManager.java    |  2 +-
 .../org/apache/openmeetings/core/remote/KurentoHandler.java    | 10 +++++++++-
 .../main/java/org/apache/openmeetings/web/room/raw-video.js    |  2 ++
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git 
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManager.java
 
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManager.java
index 1221960..83e5f40 100644
--- 
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManager.java
+++ 
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManager.java
@@ -323,7 +323,7 @@ public class LdapLoginManager {
                Long domainId = null;
                LdapConfig ldapCfg = null;
 
-               public LdapWorker(Long domainId) throws Exception {
+               public LdapWorker(Long domainId) {
                        this.domainId = domainId;
                        ldapCfg = ldapConfigDao.get(domainId);
                        loadLdapConf(ldapCfg.getConfigFileName(), config);
diff --git 
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KurentoHandler.java
 
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KurentoHandler.java
index 1668145..e1f8e40 100644
--- 
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KurentoHandler.java
+++ 
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KurentoHandler.java
@@ -404,6 +404,10 @@ public class KurentoHandler {
        }
 
        public boolean screenShareAllowed(Client c) {
+               if (client == null) {
+                       log.warn("Media Server is not accessible");
+                       return false;
+               }
                Room r = c.getRoom();
                return r != null && Room.Type.interview != r.getType()
                                && !r.isHidden(RoomElement.ScreenSharing)
@@ -412,7 +416,7 @@ public class KurentoHandler {
        }
 
        private void startSharing(Client c, JSONObject msg) {
-               if (c.getRoomId() != null) {
+               if (client != null && c.getRoomId() != null) {
                        getRoom(c.getRoomId()).startSharing(this, cm, c, msg);
                }
        }
@@ -433,6 +437,10 @@ public class KurentoHandler {
        }
 
        public boolean isSharing(Long roomId) {
+               if (client == null) {
+                       log.warn("Media Server is not accessible");
+                       return false;
+               }
                return getRoom(roomId).isSharing();
        }
 
diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-video.js 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-video.js
index a5d83ab..114fa0d 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-video.js
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-video.js
@@ -108,6 +108,7 @@ var Video = (function() {
                                                } else {
                                                        aDest = 
aCtx.createMediaStreamDestination();
                                                        gainNode.connect(aDest);
+                                                       aSrc.origStream = 
stream;
                                                        _stream = aDest.stream;
                                                        
stream.getVideoTracks().forEach(function(track) {
                                                                
_stream.addTrack(track);
@@ -438,6 +439,7 @@ var Video = (function() {
                }
                if (!!aSrc) {
                        VideoUtil.cleanStream(aSrc.mediaStream);
+                       VideoUtil.cleanStream(aSrc.origStream);
                        aSrc.disconnect();
                        aSrc = null;
                }