Author: dkulp
Date: Fri Jan 15 18:51:30 2010
New Revision: 899749
URL: http://svn.apache.org/viewvc?rev=899749&view=rev
Log:
Merged revisions 899744 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r899744 | dkulp | 2010-01-15 13:35:28 -0500 (Fri, 15 Jan 2010) | 1 line
Use non-deprecated properly spelled methods
........
Modified:
cxf/branches/2.2.x-fixes/ (props changed)
cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JSONUtils.java
Propchange: cxf/branches/2.2.x-fixes/
('svn:mergeinfo' removed)
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JSONUtils.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JSONUtils.java?rev=899749&r1=899748&r2=899749&view=diff
==============================================================================
---
cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JSONUtils.java
(original)
+++
cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JSONUtils.java
Fri Jan 15 18:51:30 2010
@@ -86,11 +86,11 @@
if (serializeAsArray) {
if (arrayKeys != null) {
for (String key : arrayKeys) {
- xsw.seriliazeAsArray(key);
+ xsw.serializeAsArray(key);
}
} else {
String key = getKey(convention, qname);
- xsw.seriliazeAsArray(key);
+ xsw.serializeAsArray(key);
}
}
XMLStreamWriter writer = !writeXsiType || dropRootElement
