cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject svn commit: r1366338 - /cxf/branches/2.6.x-fixes/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/JSONProvider.java
Date Fri, 27 Jul 2012 11:16:31 GMT
Author: sergeyb
Date: Fri Jul 27 11:16:31 2012
New Revision: 1366338

URL: http://svn.apache.org/viewvc?rev=1366338&view=rev
Log:
Fixing Jettison-related test on Java 1.5

Modified:
    cxf/branches/2.6.x-fixes/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/JSONProvider.java

Modified: cxf/branches/2.6.x-fixes/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/JSONProvider.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/JSONProvider.java?rev=1366338&r1=1366337&r2=1366338&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/JSONProvider.java
(original)
+++ cxf/branches/2.6.x-fixes/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/JSONProvider.java
Fri Jul 27 11:16:31 2012
@@ -247,7 +247,8 @@ public class JSONProvider<T> extends Abs
         } 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);



Mime
View raw message