a fully working demo, had to set the content type for the new version of the dojo...

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@691664 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/tomcat/bayeux/RequestBase.java b/java/org/apache/tomcat/bayeux/RequestBase.java
index 19df7fc..6e1fc6a 100644 (file)
--- 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);\r
         }\r
 \r
+        if (to!=null) {\r
+            if (to.useJsonFiltered()) {\r
+                if (!event.getHttpServletResponse().isCommitted()) event.getHttpServletResponse().setContentType("text/json-comment-filtered");\r
+            }else {    \r
+                if (!event.getHttpServletResponse().isCommitted()) event.getHttpServletResponse().setContentType("text/json");\r
+            }\r
+        }\r
+\r
         PrintWriter out = event.getHttpServletResponse().getWriter();\r
         if (to==null) {\r
             //do nothing\r

diff --git a/java/org/apache/tomcat/bayeux/request/MetaHandshakeRequest.java b/java/org/apache/tomcat/bayeux/request/MetaHandshakeRequest.java
index bdbb283..2835d12 100644 (file)
--- 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();\r
             client.setSupportedConnTypes(suppConnTypesFlag);\r
             client.setUseJsonFiltered(getExt().get(Bayeux.JSON_COMMENT_FILTERED_FIELD) != null);\r
-            if (client.useJsonFiltered()) {\r
-               event.getHttpServletResponse().setContentType("text/json-comment-filtered");\r
-            }else {\r
-               event.getHttpServletResponse().setContentType("text/json");\r
-            }\r
             response.put(Bayeux.CLIENT_FIELD, client.getId());\r
             ((HashMap) response.get(Bayeux.ADVICE_FIELD)).put(Bayeux.RECONNECT_FIELD, Bayeux.RETRY_RESPONSE);\r
             ((HashMap) response.get(Bayeux.ADVICE_FIELD)).put(Bayeux.INTERVAL_FIELD, getReconnectInterval());\r