mirror of
https://github.com/vanitasvitae/Smack.git
synced 2024-11-26 14:02:06 +01:00
Fix for possible 'data' var in JS being null
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@1882 b35dd754-fafc-0310-a699-88a17e54d16e
This commit is contained in:
parent
5c891a82bc
commit
66cfe5506b
1 changed files with 3 additions and 1 deletions
|
@ -140,6 +140,7 @@ public class ChatServlet extends HttpServlet implements HttpSessionListener {
|
||||||
reply.append("<meta http-equiv=\"refresh\" content=\"2\">\n");
|
reply.append("<meta http-equiv=\"refresh\" content=\"2\">\n");
|
||||||
reply.append("<script language=\"JavaScript\" type=\"text/javascript\">\n");
|
reply.append("<script language=\"JavaScript\" type=\"text/javascript\">\n");
|
||||||
reply.append("var data = window.parent.frames['data'].data;\n");
|
reply.append("var data = window.parent.frames['data'].data;\n");
|
||||||
|
reply.append("if (data != null) {\n");
|
||||||
boolean foundData = false;
|
boolean foundData = false;
|
||||||
Message message = data.groupChat.pollMessage();
|
Message message = data.groupChat.pollMessage();
|
||||||
while (message != null) {
|
while (message != null) {
|
||||||
|
@ -160,12 +161,13 @@ public class ChatServlet extends HttpServlet implements HttpSessionListener {
|
||||||
// Apply emoticons
|
// Apply emoticons
|
||||||
body = urlFilter.applyFilter(body);
|
body = urlFilter.applyFilter(body);
|
||||||
body = emoticonFilter.applyFilter(body);
|
body = emoticonFilter.applyFilter(body);
|
||||||
reply.append("data[data.length] = new Array(\"" + from + "\", \"" + body + "\");\n");
|
reply.append("\tdata[data.length] = new Array(\"" + from + "\", \"" + body + "\");\n");
|
||||||
message = data.groupChat.pollMessage();
|
message = data.groupChat.pollMessage();
|
||||||
}
|
}
|
||||||
if (foundData) {
|
if (foundData) {
|
||||||
reply.append("window.parent.frames['main'].location.reload();\n");
|
reply.append("window.parent.frames['main'].location.reload();\n");
|
||||||
}
|
}
|
||||||
|
reply.append("}\n");
|
||||||
reply.append("</script>\n");
|
reply.append("</script>\n");
|
||||||
reply.append("</head>\n");
|
reply.append("</head>\n");
|
||||||
reply.append("<body></body>\n");
|
reply.append("<body></body>\n");
|
||||||
|
|
Loading…
Reference in a new issue