From bf92c754d9d3470452e9eb98d4293fa57e2f5500 Mon Sep 17 00:00:00 2001 From: fhanik Date: Wed, 3 Sep 2008 16:28:41 +0000 Subject: [PATCH] a fully working demo, had to set the content type for the new version of the dojo toolkit to properly parse the json data, otherwise it thinks it is xml git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@691664 13f79535-47bb-0310-9956-ffa450edef68 --- java/org/apache/tomcat/bayeux/RequestBase.java | 8 ++++++++ java/org/apache/tomcat/bayeux/request/MetaHandshakeRequest.java | 5 ----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/java/org/apache/tomcat/bayeux/RequestBase.java b/java/org/apache/tomcat/bayeux/RequestBase.java index 19df7fc1c..6e1fc6a4a 100644 --- a/java/org/apache/tomcat/bayeux/RequestBase.java +++ b/java/org/apache/tomcat/bayeux/RequestBase.java @@ -163,6 +163,14 @@ public abstract class RequestBase implements BayeuxRequest { log.debug("["+Thread.currentThread().getName()+"] Delivering message to[" + to + "] message:" + jsonstring); } + if (to!=null) { + if (to.useJsonFiltered()) { + if (!event.getHttpServletResponse().isCommitted()) event.getHttpServletResponse().setContentType("text/json-comment-filtered"); + }else { + if (!event.getHttpServletResponse().isCommitted()) event.getHttpServletResponse().setContentType("text/json"); + } + } + PrintWriter out = event.getHttpServletResponse().getWriter(); if (to==null) { //do nothing diff --git a/java/org/apache/tomcat/bayeux/request/MetaHandshakeRequest.java b/java/org/apache/tomcat/bayeux/request/MetaHandshakeRequest.java index bdbb2832d..2835d1252 100644 --- a/java/org/apache/tomcat/bayeux/request/MetaHandshakeRequest.java +++ b/java/org/apache/tomcat/bayeux/request/MetaHandshakeRequest.java @@ -93,11 +93,6 @@ public class MetaHandshakeRequest extends RequestBase implements BayeuxRequest { clientId = client.getId(); client.setSupportedConnTypes(suppConnTypesFlag); client.setUseJsonFiltered(getExt().get(Bayeux.JSON_COMMENT_FILTERED_FIELD) != null); - if (client.useJsonFiltered()) { - event.getHttpServletResponse().setContentType("text/json-comment-filtered"); - }else { - event.getHttpServletResponse().setContentType("text/json"); - } response.put(Bayeux.CLIENT_FIELD, client.getId()); ((HashMap) response.get(Bayeux.ADVICE_FIELD)).put(Bayeux.RECONNECT_FIELD, Bayeux.RETRY_RESPONSE); ((HashMap) response.get(Bayeux.ADVICE_FIELD)).put(Bayeux.INTERVAL_FIELD, getReconnectInterval()); -- 2.11.0