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/03/29 15:00:13 UTC

[openmeetings] branch master updated: [OPENMEETINGS-1649] code clean-up

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 bc23152  [OPENMEETINGS-1649] code clean-up
bc23152 is described below

commit bc23152720f0d058bd13df13c20a1a219239f4b0
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Thu Mar 29 21:59:35 2018 +0700

    [OPENMEETINGS-1649] code clean-up
---
 .../java/org/apache/openmeetings/core/remote/KurentoHandler.java    | 6 ++++++
 .../main/java/org/apache/openmeetings/web/app/ClientManager.java    | 5 +++++
 .../java/org/apache/openmeetings/web/common/OmWebSocketPanel.java   | 4 ++--
 openmeetings-web/src/main/webapp/WEB-INF/classes/hazelcast.xml      | 2 +-
 .../src/test/java/org/apache/openmeetings/AbstractWicketTester.java | 3 ++-
 5 files changed, 16 insertions(+), 4 deletions(-)

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 ff46705..ee62779 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
@@ -145,6 +145,9 @@ public class KurentoHandler {
 		room.join(this, c.getUid());
 	}
 
+	public void leaveRoom(Client c) {
+	}
+
 	public void sendClient(String uid, JSONObject msg) {
 		WebSocketHelper.sendClient(clientManager.get(uid), msg);
 	}
@@ -156,6 +159,9 @@ public class KurentoHandler {
 	}
 
 	public void remove(IWsClient c) {
+		if (c == null) {
+			return;
+		}
 		final String uid = c.getUid();
 		final boolean test = !(c instanceof Client);
 		IKUser u = test ? getTestByUid(uid) : getByUid(uid);
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 84468ea..a81591d 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
@@ -32,6 +32,7 @@ import java.util.function.Predicate;
 
 import javax.annotation.PostConstruct;
 
+import org.apache.openmeetings.core.remote.KurentoHandler;
 import org.apache.openmeetings.db.dao.log.ConferenceLogDao;
 import org.apache.openmeetings.db.entity.basic.Client;
 import org.apache.openmeetings.db.entity.basic.IClient;
@@ -64,6 +65,8 @@ public class ClientManager implements IClientManager {
 	private ConferenceLogDao confLogDao;
 	@Autowired
 	private Application app;
+	@Autowired
+	private KurentoHandler kHandler;
 
 	private IMap<String, Client> map() {
 		return app.hazelcast.getMap(ONLINE_USERS_KEY);
@@ -129,6 +132,7 @@ public class ClientManager implements IClientManager {
 	public void exit(IClient c) {
 		if (c != null) {
 			exitRoom(c);
+			kHandler.remove((Client)c);
 			log.debug("Removing online client: {}, roomId: {}", c.getUid(), c.getRoomId());
 			map().remove(c.getUid());
 			onlineClients.remove(c.getUid());
@@ -196,6 +200,7 @@ public class ClientManager implements IClientManager {
 			if (_c instanceof Client) {
 				//FIXME TODO scopeAdapter.dropSharing(_c, roomId);
 				Client c = (Client)_c;
+				kHandler.leaveRoom(c);
 				/* FIXME TODO
 				IScope sc = scopeAdapter.getChildScope(roomId);
 				for (String uid : c.getStreams()) {
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/OmWebSocketPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/OmWebSocketPanel.java
index fb72f0b..1c7a1cf 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/OmWebSocketPanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/OmWebSocketPanel.java
@@ -49,7 +49,7 @@ import com.github.openjson.JSONObject;
 public abstract class OmWebSocketPanel extends Panel {
 	private static final long serialVersionUID = 1L;
 	private static final Logger log = LoggerFactory.getLogger(OmWebSocketPanel.class);
-	private static final String CONNECTED_MSG = "socketConnected";
+	public static final String CONNECTED_MSG = "socketConnected";
 	private final AbstractAjaxTimerBehavior pingTimer = new AbstractAjaxTimerBehavior(Duration.seconds(30)) {
 		private static final long serialVersionUID = 1L;
 
@@ -78,7 +78,7 @@ public abstract class OmWebSocketPanel extends Panel {
 
 		@Override
 		protected void onMessage(WebSocketRequestHandler handler, TextMessage msg) {
-			if ("socketConnected".equals(msg.getText())) {
+			if (CONNECTED_MSG.equals(msg.getText())) {
 				OmWebSocketPanel.this.onConnect(handler);
 				log.debug("WebSocketBehavior:: pingTimer is attached");
 				pingTimer.restart(handler);
diff --git a/openmeetings-web/src/main/webapp/WEB-INF/classes/hazelcast.xml b/openmeetings-web/src/main/webapp/WEB-INF/classes/hazelcast.xml
index 57cd2e4..c0a965b 100644
--- a/openmeetings-web/src/main/webapp/WEB-INF/classes/hazelcast.xml
+++ b/openmeetings-web/src/main/webapp/WEB-INF/classes/hazelcast.xml
@@ -25,7 +25,7 @@
 	>
 	<map name="ONLINE_USERS_KEY">
 		<near-cache>
-			<eviction-policy>NONE</eviction-policy>
+			<eviction eviction-policy="NONE"/>
 			<in-memory-format>OBJECT</in-memory-format>
 			<cache-local-entries>true</cache-local-entries>
 		</near-cache>
diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/AbstractWicketTester.java b/openmeetings-web/src/test/java/org/apache/openmeetings/AbstractWicketTester.java
index 77be8b4..0003de2 100644
--- a/openmeetings-web/src/test/java/org/apache/openmeetings/AbstractWicketTester.java
+++ b/openmeetings-web/src/test/java/org/apache/openmeetings/AbstractWicketTester.java
@@ -19,6 +19,7 @@
 package org.apache.openmeetings;
 
 import static org.apache.openmeetings.db.util.ApplicationHelper.ensureApplication;
+import static org.apache.openmeetings.web.common.OmWebSocketPanel.CONNECTED_MSG;
 import static org.apache.wicket.util.string.Strings.escapeMarkup;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -129,7 +130,7 @@ public class AbstractWicketTester extends AbstractJUnitDefaults {
 		tester.executeBehavior((AbstractAjaxBehavior)page.getBehaviorById(0));
 		tester.executeBehavior((AbstractAjaxBehavior)page.get("main-container").getBehaviorById(0));
 		WebSocketTester webSocketTester = new WebSocketTester(tester, page);
-		webSocketTester.sendMessage("socketConnected");
+		webSocketTester.sendMessage(CONNECTED_MSG);
 
 		consumer.accept(page);
 		tester.getSession().invalidateNow();

-- 
To stop receiving notification emails like this one, please contact
solomax@apache.org.