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 c6eacf0 [OPENMEETINGS-2493] code clean-up
c6eacf0 is described below
commit c6eacf0301016b5bc822a0f0792df571bb24f826
Author: Maxim Solodovnik <solomax...@gmail.com>
AuthorDate: Sat Oct 24 22:25:12 2020 +0700
[OPENMEETINGS-2493] code clean-up
---
.../main/java/org/apache/openmeetings/core/remote/KStream.java | 2 +-
.../org/apache/openmeetings/core/remote/KurentoHandler.java | 10 ++++++----
.../java/org/apache/openmeetings/web/app/ClientManager.java | 3 ---
3 files changed, 7 insertions(+), 8 deletions(-)
diff --git
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KStream.java
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KStream.java
index c79fd40..1b077eb 100644
---
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KStream.java
+++
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KStream.java
@@ -356,6 +356,7 @@ public class KStream extends AbstractStream {
public void release(boolean remove) {
if (outgoingMedia != null) {
releaseListeners();
+ releaseRecorder(false);
outgoingMedia.release(new Continuation<Void>() {
@Override
public void onSuccess(Void result) throws
Exception {
@@ -378,7 +379,6 @@ public class KStream extends AbstractStream {
log.warn("PARTICIPANT {}: Could not
release Pipeline", KStream.this.uid, cause);
}
});
- releaseRecorder(false);
outgoingMedia = null;
}
if (remove) {
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 7023063..12580c2 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
@@ -469,9 +469,10 @@ public class KurentoHandler {
}
}
} catch (Exception e) {
- log.warn("Invalid MediaPipeline
{} detected, will be dropped, tags: {}", pipe.getId(), tags);
- pipe.release();
+ log.warn("Unexpected error
while checking MediaPipeline {}, tags: {}", pipe.getId(), tags, e);
}
+ log.warn("Invalid MediaPipeline {}
detected, will be dropped, tags: {}", pipe.getId(), tags);
+ pipe.release();
}, objCheckTimeout, MILLISECONDS);
} else if (evt.getObject() instanceof Endpoint) {
// endpoint created
@@ -510,9 +511,10 @@ public class KurentoHandler {
return;
}
} catch (Exception e) {
-
log.warn("Kurento::ObjectCreated -> Invalid Endpoint {} detected, will be
dropped, tags: {}", point.getId(), tags);
- point.release();
+ log.warn("Unexpected error
while checking Endpoint {}, tags: {}", point.getId(), tags, e);
}
+ log.warn("Invalid Endpoint {} detected,
will be dropped, tags: {}", point.getId(), tags);
+ point.release();
}, objCheckTimeout, MILLISECONDS);
}
}
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/ClientManager.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/ClientManager.java
index e4f38f0..4521346 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/ClientManager.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/ClientManager.java
@@ -37,7 +37,6 @@ import java.util.stream.Collectors;
import java.util.stream.Stream;
import org.apache.openmeetings.core.remote.KurentoHandler;
-import org.apache.openmeetings.core.sip.SipManager;
import org.apache.openmeetings.db.dao.log.ConferenceLogDao;
import org.apache.openmeetings.db.entity.basic.Client;
import org.apache.openmeetings.db.entity.log.ConferenceLog;
@@ -79,8 +78,6 @@ public class ClientManager implements IClientManager {
@Autowired
private KurentoHandler kHandler;
@Autowired
- private SipManager sipManager;
- @Autowired
private TimerService timerService;
private IMap<String, Client> map() {
