You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2018/04/04 15:50:52 UTC
[openmeetings] branch master updated: [OPENMEETINGS-1860] sip
integration seems to be fixed
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 bb0d8c8 [OPENMEETINGS-1860] sip integration seems to be fixed
bb0d8c8 is described below
commit bb0d8c8af19016da58b65c7afef1cccf49dc4a93
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Wed Apr 4 22:48:59 2018 +0700
[OPENMEETINGS-1860] sip integration seems to be fixed
---
.../apache/openmeetings/core/remote/ScopeApplicationAdapter.java | 9 +++++++++
.../org/apache/openmeetings/web/app/StreamClientManager.java | 1 +
2 files changed, 10 insertions(+)
diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ScopeApplicationAdapter.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ScopeApplicationAdapter.java
index 80e1543..e8736ca 100644
--- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ScopeApplicationAdapter.java
+++ b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ScopeApplicationAdapter.java
@@ -133,6 +133,15 @@ public class ScopeApplicationAdapter /*extends MultiThreadedApplicationAdapter i
}
@Override
+ public void appDisconnect(IConnection conn) {
+ StreamClient c = streamClientManager.get(IClientUtil.getId(conn.getClient()));
+ if (c != null && Client.Type.sip == c.getType()) {
+ clientManager.exit(c);
+ }
+ super.appDisconnect(conn);
+ }
+
+ @Override
public boolean roomConnect(IConnection conn, Object[] params) {
_log.debug("roomConnect : ");
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/StreamClientManager.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/StreamClientManager.java
index 8280eac..2fb42d8 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/StreamClientManager.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/StreamClientManager.java
@@ -163,6 +163,7 @@ public class StreamClientManager implements IStreamClientManager {
client.setMic(0);
client.allow(Room.Right.audio, Room.Right.video);
client.set(Activity.broadcastA);
+ client.setRoom(roomDao.get(rcl.getRoomId()));
clientManager.addToRoom(client);
WebSocketHelper.sendRoom(new RoomMessage(client.getRoom().getId(), client, RoomMessage.Type.roomEnter));
} else {
--
To stop receiving notification emails like this one, please contact
solomax@apache.org.