svn commit: r1783911 - in /openmeetings/application: branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java

[solomax]

Author: solomax
Date: Tue Feb 21 17:10:37 2017
New Revision: 1783911

URL: http://svn.apache.org/viewvc?rev=1783911&view=rev
Log:
no jira: websocket ping should be fixed

Modified:
    
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java
    
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java

Modified: 
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java
URL: 
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java?rev=1783911&r1=1783910&r2=1783911&view=diff
==============================================================================
--- 
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java
 (original)
+++ 
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java
 Tue Feb 21 17:10:37 2017
@@ -217,7 +217,8 @@ public class MainPanel extends Panel {
                                response.render(new 
PriorityHeaderItem(getNamedFunction("privateMessage", this, 
explicit(PARAM_USER_ID))));
                        }
                });
-               add(new WebSocketBehavior() {
+               pingTimer.stop(null);
+               add(pingTimer, new WebSocketBehavior() {
                        private static final long serialVersionUID = 1L;
 
                        @Override
@@ -235,7 +236,7 @@ public class MainPanel extends Panel {
                                                updateContents(panel, handler);
                                        }
                                        log.debug("WebSocketBehavior:: 
pingTimer is attached");
-                                       
handler.add(MainPanel.this.add(pingTimer));
+                                       pingTimer.restart(handler);
                                }
                        }
 

Modified: 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java
URL: 
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java?rev=1783911&r1=1783910&r2=1783911&view=diff
==============================================================================
--- 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java
 (original)
+++ 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java
 Tue Feb 21 17:10:37 2017
@@ -217,7 +217,8 @@ public class MainPanel extends Panel {
                                response.render(new 
PriorityHeaderItem(getNamedFunction("privateMessage", this, 
explicit(PARAM_USER_ID))));
                        }
                });
-               add(new WebSocketBehavior() {
+               pingTimer.stop(null);
+               add(pingTimer, new WebSocketBehavior() {
                        private static final long serialVersionUID = 1L;
 
                        @Override
@@ -235,7 +236,7 @@ public class MainPanel extends Panel {
                                                updateContents(panel, handler);
                                        }
                                        log.debug("WebSocketBehavior:: 
pingTimer is attached");
-                                       
handler.add(MainPanel.this.add(pingTimer));
+                                       pingTimer.restart(handler);
                                }
                        }