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 2016/11/11 03:32:41 UTC
svn commit: r1769242 - in /openmeetings/application:
branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/
branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/
branches/3.2.x/openmeetings-web/src/m...
Author: solomax
Date: Fri Nov 11 03:32:41 2016
New Revision: 1769242
URL: http://svn.apache.org/viewvc?rev=1769242&view=rev
Log:
no jira: workaround for WICKET 6232
Modified:
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat.js
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat.js
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat.js
Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java?rev=1769242&r1=1769241&r2=1769242&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java Fri Nov 11 03:32:41 2016
@@ -120,7 +120,8 @@ public class MainPanel extends Panel {
@Override
public void run() {
try {
- wsConnection.sendMessage(new byte[1], 0, 1);
+ //wsConnection.sendMessage(new byte[1], 0, 1); //FIXME TODO commented for now
+ wsConnection.sendMessage("ping");
} catch (IOException e) {
log.error("Error while sending ping message to room", e);
}
Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat.js
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat.js?rev=1769242&r1=1769241&r2=1769242&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat.js (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat.js Fri Nov 11 03:32:41 2016
@@ -28,13 +28,17 @@ var chatTabs, tabTemplate = "<li><a href
, closedHeight = "20px", openedHeight = "345px";
$(function() {
Wicket.Event.subscribe("/websocket/message", function(jqEvent, msg) {
- var m = jQuery.parseJSON(msg);
- if (m) {
- switch(m.type) {
- case "chat":
- addChatMessage(m);
- break;
+ try {
+ var m = jQuery.parseJSON(msg);
+ if (m) {
+ switch(m.type) {
+ case "chat":
+ addChatMessage(m);
+ break;
+ }
}
+ } catch (err) {
+ //no-op
}
});
reinit();
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=1769242&r1=1769241&r2=1769242&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 Fri Nov 11 03:32:41 2016
@@ -125,7 +125,8 @@ public class MainPanel extends Panel {
@Override
public void run() {
try {
- wsConnection.sendMessage(new byte[1], 0, 1);
+ //wsConnection.sendMessage(new byte[1], 0, 1); //FIXME TODO commented for now
+ wsConnection.sendMessage("ping");
} catch (IOException e) {
log.error("Error while sending ping message to room", e);
}
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat.js
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat.js?rev=1769242&r1=1769241&r2=1769242&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat.js (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat.js Fri Nov 11 03:32:41 2016
@@ -28,13 +28,17 @@ var chatTabs, tabTemplate = "<li><a href
, closedHeight = "20px", openedHeight = "345px";
$(function() {
Wicket.Event.subscribe("/websocket/message", function(jqEvent, msg) {
- var m = jQuery.parseJSON(msg);
- if (m) {
- switch(m.type) {
- case "chat":
- addChatMessage(m);
- break;
+ try {
+ var m = jQuery.parseJSON(msg);
+ if (m) {
+ switch(m.type) {
+ case "chat":
+ addChatMessage(m);
+ break;
+ }
}
+ } catch (err) {
+ //no-op
}
});
reinit();
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat.js
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat.js?rev=1769242&r1=1769241&r2=1769242&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat.js (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat.js Fri Nov 11 03:32:41 2016
@@ -28,13 +28,17 @@ var chatTabs, tabTemplate = "<li><a href
, closedHeight = "20px", openedHeight = "345px";
$(function() {
Wicket.Event.subscribe("/websocket/message", function(jqEvent, msg) {
- var m = jQuery.parseJSON(msg);
- if (m) {
- switch(m.type) {
- case "chat":
- addChatMessage(m);
- break;
+ try {
+ var m = jQuery.parseJSON(msg);
+ if (m) {
+ switch(m.type) {
+ case "chat":
+ addChatMessage(m);
+ break;
+ }
}
+ } catch (err) {
+ //no-op
}
});
reinit();