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

[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 c07e938  [OPENMEETINGS-1867] minor code clean-up
c07e938 is described below

commit c07e938c383b1d9f91743ff7c9e03cc7b19387fd
Author: Maxim Solodovnik <solomax...@gmail.com>
AuthorDate: Fri Mar 29 20:09:40 2019 +0700

    [OPENMEETINGS-1867] minor code clean-up
---
 .../java/org/apache/openmeetings/web/app/Application.java    | 12 ++++++------
 .../org/apache/openmeetings/web/common/OmWebSocketPanel.java |  5 +++++
 .../java/org/apache/openmeetings/web/room/RoomPanel.java     |  3 +--
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
index adc2c96..744e9d2 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
@@ -184,12 +184,12 @@ public class Application extends 
AuthenticatedWebApplication implements IApplica
                
hazelcast.getCluster().getLocalMember().setStringAttribute(NAME_ATTR_KEY, 
hazelcast.getName());
                hazelWsTopic = hazelcast.getTopic("default");
                hazelWsTopic.addMessageListener(msg -> {
-                               String serverId = 
msg.getPublishingMember().getStringAttribute(NAME_ATTR_KEY);
-                               if (serverId.equals(hazelcast.getName())) {
-                                       return;
-                               }
-                               WbWebSocketHelper.send(msg.getMessageObject());
-                       });
+                       String serverId = 
msg.getPublishingMember().getStringAttribute(NAME_ATTR_KEY);
+                       if (serverId.equals(hazelcast.getName())) {
+                               return;
+                       }
+                       WbWebSocketHelper.send(msg.getMessageObject());
+               });
                hazelcast.getCluster().addMembershipListener(new 
MembershipListener() {
                        @Override
                        public void memberRemoved(MembershipEvent evt) {
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 868c819..c9129c7 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
@@ -141,6 +141,11 @@ public abstract class OmWebSocketPanel extends Panel {
 
        public OmWebSocketPanel(String id) {
                super(id);
+       }
+
+       @Override
+       protected void onInitialize() {
+               super.onInitialize();
                add(pingTimer, wsBehavior);
                pingTimer.stop(null);
        }
diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
index 0498c29..fdfad5f 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
@@ -144,8 +144,7 @@ public class RoomPanel extends BasePanel {
                        if (!Strings.isEmpty(r.getRedirectURL()) && 
(ws.getSoapLogin() != null || ws.getInvitation() != null)) {
                                options.put("reloadUrl", r.getRedirectURL());
                        }
-                       StringBuilder sb = new StringBuilder()
-                                       
.append("Room.init(").append(options.toString(new NullStringer())).append(");")
+                       StringBuilder sb = new 
StringBuilder("Room.init(").append(options.toString(new 
NullStringer())).append(");")
                                        .append(wb.getInitScript())
                                        .append("Room.setSize();")
                                        .append(getQuickPollJs());