Author: sergeyb Date: Fri Jul 27 11:57:19 2012 New Revision: 1366351 URL: http://svn.apache.org/viewvc?rev=1366351&view=rev Log: Merged revisions 1366347 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
................ r1366347 | sergeyb | 2012-07-27 12:54:51 +0100 (Fri, 27 Jul 2012) | 9 lines 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.4.x-fixes/ (props changed) cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JSONProvider.java Propchange: cxf/branches/2.4.x-fixes/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Fri Jul 27 11:57:19 2012 @@ -0,0 +1,2 @@ +/cxf/branches/2.5.x-fixes:1366347 +/cxf/branches/2.6.x-fixes:1366338 Propchange: cxf/branches/2.4.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JSONProvider.java URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JSONProvider.java?rev=1366351&r1=1366350&r2=1366351&view=diff ============================================================================== --- cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JSONProvider.java (original) +++ cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JSONProvider.java Fri Jul 27 11:57:19 2012 @@ -245,7 +245,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);
