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 2020/04/08 13:11:21 UTC
[openmeetings] branch master updated: [OPENMEETINGS-2203] checking
hashes
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 0aeecaf [OPENMEETINGS-2203] checking hashes
0aeecaf is described below
commit 0aeecafda664c59954557e3c158a823fdb3ebc34
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Wed Apr 8 20:11:06 2020 +0700
[OPENMEETINGS-2203] checking hashes
---
.../java/org/apache/openmeetings/web/app/ClientManager.java | 12 +++++++-----
.../java/org/apache/openmeetings/web/pages/MainPage.java | 4 ----
2 files changed, 7 insertions(+), 9 deletions(-)
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 0ecad1f..562bb0e 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
@@ -399,8 +399,7 @@ public class ClientManager implements IClientManager {
, EntryUpdatedListener<String, Client>
, EntryRemovedListener<String, Client>
{
- @Override
- public void entryAdded(EntryEvent<String, Client> event) {
+ private void process(EntryEvent<String, Client> event) {
final String uid = event.getKey();
synchronized (onlineClients) {
if (onlineClients.containsKey(uid)) {
@@ -412,10 +411,13 @@ public class ClientManager implements IClientManager {
}
@Override
+ public void entryAdded(EntryEvent<String, Client> event) {
+ process(event);
+ }
+
+ @Override
public void entryUpdated(EntryEvent<String, Client> event) {
- synchronized (onlineClients) {
- onlineClients.get(event.getKey()).merge(event.getValue());
- }
+ process(event);
}
@Override
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/MainPage.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/MainPage.java
index 3df2d36..dc88e0d 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/MainPage.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/MainPage.java
@@ -78,10 +78,6 @@ public class MainPage extends BaseInitedPage {
private OmUrlFragment uf = null;
private boolean loaded = false;
- public MainPage() {
- super();
- }
-
public void updateContents(OmUrlFragment f, IPartialPageRequestHandler handler) {
main.updateContents(f, handler);
}