You are viewing a plain text version of this content. The canonical link for it is here.

Posted to oak-commits@jackrabbit.apache.org by dp...@apache.org on 2012/08/21 09:20:45 UTC

svn commit: r1375406 - /jackrabbit/oak/trunk/oak-mk-remote/src/main/java/org/apache/jackrabbit/mk/server/MicroKernelServlet.java

Author: dpfister
Date: Tue Aug 21 07:20:45 2012
New Revision: 1375406

URL: http://svn.apache.org/viewvc?rev=1375406&view=rev
Log:
Output of diff() is not proper json

Modified:
    jackrabbit/oak/trunk/oak-mk-remote/src/main/java/org/apache/jackrabbit/mk/server/MicroKernelServlet.java

Modified: jackrabbit/oak/trunk/oak-mk-remote/src/main/java/org/apache/jackrabbit/mk/server/MicroKernelServlet.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-mk-remote/src/main/java/org/apache/jackrabbit/mk/server/MicroKernelServlet.java?rev=1375406&r1=1375405&r2=1375406&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-mk-remote/src/main/java/org/apache/jackrabbit/mk/server/MicroKernelServlet.java (original)
+++ jackrabbit/oak/trunk/oak-mk-remote/src/main/java/org/apache/jackrabbit/mk/server/MicroKernelServlet.java Tue Aug 21 07:20:45 2012
@@ -177,7 +177,7 @@ class MicroKernelServlet {
             String path = request.getParameter("path", "");
             int depth = request.getParameter("depth", 1);
 
-            response.setContentType("application/json");
+            response.setContentType("text/plain");
             String json = mk.diff(fromRevisionId, toRevisionId, path, depth);
             if (request.getUserAgent() != null) {
                 json = JsopBuilder.prettyPrint(json);