Return-Path: X-Original-To: apmail-felix-commits-archive@www.apache.org Delivered-To: apmail-felix-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id DC11872CA for ; Mon, 12 Sep 2011 14:16:18 +0000 (UTC) Received: (qmail 14635 invoked by uid 500); 12 Sep 2011 14:11:46 -0000 Delivered-To: apmail-felix-commits-archive@felix.apache.org Received: (qmail 13909 invoked by uid 500); 12 Sep 2011 14:11:25 -0000 Mailing-List: contact commits-help@felix.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@felix.apache.org Delivered-To: mailing list commits@felix.apache.org Received: (qmail 13846 invoked by uid 99); 12 Sep 2011 14:11:22 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 12 Sep 2011 14:11:22 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 12 Sep 2011 14:11:21 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 6240223889E2 for ; Mon, 12 Sep 2011 14:11:01 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1169752 - /felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/core/BundlesServlet.java Date: Mon, 12 Sep 2011 14:11:01 -0000 To: commits@felix.apache.org From: vvalchev@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110912141101.6240223889E2@eris.apache.org> Author: vvalchev Date: Mon Sep 12 14:11:01 2011 New Revision: 1169752 URL: http://svn.apache.org/viewvc?rev=1169752&view=rev Log: Fixed FELIX-2889 : Invalid JSON content in http response after starting or stopping a bundle. https://issues.apache.org/jira/browse/FELIX-2889 Modified: felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/core/BundlesServlet.java Modified: felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/core/BundlesServlet.java URL: http://svn.apache.org/viewvc/felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/core/BundlesServlet.java?rev=1169752&r1=1169751&r2=1169752&view=diff ============================================================================== --- felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/core/BundlesServlet.java (original) +++ felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/core/BundlesServlet.java Mon Sep 12 14:11:01 2011 @@ -353,8 +353,10 @@ public class BundlesServlet extends Simp } // write the state only - resp.getWriter().print("{fragment:" + isFragmentBundle(bundle) // - + ",stateRaw:" + bundle.getState() + "}"); + resp.setContentType( "application/json" ); //$NON-NLS-1$ + resp.setCharacterEncoding( "UTF-8" ); //$NON-NLS-1$ + resp.getWriter().print("{fragment:" + isFragmentBundle(bundle) // //$NON-NLS-1$ + + ",stateRaw:" + bundle.getState() + "}"); //$NON-NLS-1$ //$NON-NLS-2$ return; } }