You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by se...@apache.org on 2012/07/27 13:54:51 UTC
svn commit: r1366347 - in /cxf/branches/2.5.x-fixes: ./
rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JSONProvider.java
Author: sergeyb
Date: Fri Jul 27 11:54:51 2012
New Revision: 1366347
URL: http://svn.apache.org/viewvc?rev=1366347&view=rev
Log:
Merged revisions 1366338 via svnmerge from
https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes
........
r1366338 | sergeyb | 2012-07-27 12:16:31 +0100 (Fri, 27 Jul 2012) | 1 line
Fixing Jettison-related test on Java 1.5
........
Modified:
cxf/branches/2.5.x-fixes/ (props changed)
cxf/branches/2.5.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JSONProvider.java
Propchange: cxf/branches/2.5.x-fixes/
------------------------------------------------------------------------------
Merged /cxf/branches/2.6.x-fixes:r1366338
Propchange: cxf/branches/2.5.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.5.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JSONProvider.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JSONProvider.java?rev=1366347&r1=1366346&r2=1366347&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JSONProvider.java (original)
+++ cxf/branches/2.5.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JSONProvider.java Fri Jul 27 11:54:51 2012
@@ -247,7 +247,8 @@ public class JSONProvider extends Abstra
} catch (JAXBException e) {
handleJAXBException(e, true);
} catch (XMLStreamException e) {
- if (e.getCause() instanceof JSONSequenceTooLargeException) {
+ if (e.getCause() instanceof JSONSequenceTooLargeException
+ || e.getNestedException() instanceof JSONSequenceTooLargeException) {
throw new WebApplicationException(413);
} else {
handleXMLStreamException(e, true);