Return-Path: Delivered-To: apmail-cxf-dev-archive@www.apache.org Received: (qmail 30583 invoked from network); 4 Dec 2008 22:34:37 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 4 Dec 2008 22:34:37 -0000 Received: (qmail 9223 invoked by uid 500); 4 Dec 2008 22:34:48 -0000 Delivered-To: apmail-cxf-dev-archive@cxf.apache.org Received: (qmail 9199 invoked by uid 500); 4 Dec 2008 22:34:48 -0000 Mailing-List: contact dev-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list dev@cxf.apache.org Received: (qmail 9188 invoked by uid 99); 4 Dec 2008 22:34:48 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 04 Dec 2008 14:34:48 -0800 X-ASF-Spam-Status: No, hits=-0.0 required=10.0 tests=FM_FAKE_HELO_VERIZON,SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (athena.apache.org: domain of glen.mazza@verizon.net designates 206.46.252.46 as permitted sender) Received: from [206.46.252.46] (HELO vms046pub.verizon.net) (206.46.252.46) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 04 Dec 2008 22:33:19 +0000 Received: from [192.168.1.44] ([70.17.84.20]) by vms046.mailsrvcs.net (Sun Java System Messaging Server 6.2-6.01 (built Apr 3 2006)) with ESMTPA id <0KBD005W4IOUCE99@vms046.mailsrvcs.net> for dev@cxf.apache.org; Thu, 04 Dec 2008 16:34:07 -0600 (CST) Date: Thu, 04 Dec 2008 17:34:06 -0500 From: Glen Mazza Subject: Re: svn commit: r723397 - in /cxf/branches/2.1.x-fixes: ./ rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/schemas/ rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/ rt/... In-reply-to: <20081204190821.95F472388892@eris.apache.org> To: dev@cxf.apache.org Message-id: <1228430046.5870.4.camel@gmazza-desktop> MIME-version: 1.0 X-Mailer: Evolution 2.22.3.1 Content-type: text/plain Content-transfer-encoding: 7bit References: <20081204190821.95F472388892@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org On Thu, 2008-12-04 at 19:08 +0000, sergeyb@apache.org wrote: > Author: sergeyb > Date: Thu Dec 4 11:08:20 2008 > New Revision: 723397 > > > Modified: cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JSONProvider.java > URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JSONProvider.java?rev=723397&r1=723396&r2=723397&view=diff > ============================================================================== > --- cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JSONProvider.java (original) > +++ cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JSONProvider.java Thu Dec 4 11:08:20 2008 > @@ -23,6 +23,7 @@ > > public void writeTo(Object obj, Class cls, Type genericType, Annotation[] anns, > @@ -103,8 +124,22 @@ > } > Marshaller ms = createMarshaller(actualObject, actualClass, genericType, m); > > - XMLOutputFactory factory = new MappedXMLOutputFactory(namespaceMap); > - XMLStreamWriter xsw = factory.createXMLStreamWriter(os); > + Configuration c = new Configuration(namespaceMap); > + MappedNamespaceConvention convention = new MappedNamespaceConvention(c); > + AbstractXMLStreamWriter xsw = new MappedXMLStreamWriter( > + convention, > + new OutputStreamWriter(os, "UTF-8")); > + if (serializeAsArray) { > + if (arrayKeys != null) { > + for (String key : arrayKeys) { > + xsw.seriliazeAsArray(key); serializeAsArray(key);