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 2017/02/08 07:52:31 UTC
svn commit: r1782115 - in /openmeetings/application:
branches/3.2.x/openmeetings-service/
branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/
trunk/openmeetings-service/
trunk/openmeetings-web/src/main/java/org/apache/open...
Author: solomax
Date: Wed Feb 8 07:52:31 2017
New Revision: 1782115
URL: http://svn.apache.org/viewvc?rev=1782115&view=rev
Log:
[OPENMEETINGS-895] web socket ping timer is correctly attached; SNAPSHOT dependency is fixed
Modified:
openmeetings/application/branches/3.2.x/openmeetings-service/pom.xml
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java
openmeetings/application/trunk/openmeetings-service/pom.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java
Modified: openmeetings/application/branches/3.2.x/openmeetings-service/pom.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-service/pom.xml?rev=1782115&r1=1782114&r2=1782115&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-service/pom.xml (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-service/pom.xml Wed Feb 8 07:52:31 2017
@@ -45,7 +45,7 @@
<dependency>
<groupId>com.github.caldav4j</groupId>
<artifactId>caldav4j</artifactId>
- <version>0.9-SNAPSHOT</version>
+ <version>0.9-om</version>
<exclusions>
<exclusion>
<!-- Remove the need for ehcache, since we use the Methods directly -->
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=1782115&r1=1782114&r2=1782115&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 Wed Feb 8 07:52:31 2017
@@ -252,8 +252,9 @@ public class MainPanel extends Panel {
if ("socketConnected".equals(msg.getText())) {
if (panel != null) {
updateContents(panel, handler);
- handler.add(MainPanel.this.add(pingTimer));
}
+ log.debug("WebSocketBehavior:: pingTimer is attached");
+ handler.add(MainPanel.this.add(pingTimer));
}
}
Modified: openmeetings/application/trunk/openmeetings-service/pom.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-service/pom.xml?rev=1782115&r1=1782114&r2=1782115&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-service/pom.xml (original)
+++ openmeetings/application/trunk/openmeetings-service/pom.xml Wed Feb 8 07:52:31 2017
@@ -45,7 +45,7 @@
<dependency>
<groupId>com.github.caldav4j</groupId>
<artifactId>caldav4j</artifactId>
- <version>0.9-SNAPSHOT</version>
+ <version>0.9-om</version>
<exclusions>
<exclusion>
<!-- Remove the need for ehcache, since we use the Methods directly -->
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=1782115&r1=1782114&r2=1782115&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 Wed Feb 8 07:52:31 2017
@@ -252,8 +252,9 @@ public class MainPanel extends Panel {
if ("socketConnected".equals(msg.getText())) {
if (panel != null) {
updateContents(panel, handler);
- handler.add(MainPanel.this.add(pingTimer));
}
+ log.debug("WebSocketBehavior:: pingTimer is attached");
+ handler.add(MainPanel.this.add(pingTimer));
}
}