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/05/02 17:54:05 UTC
svn commit: r1333086 - in /cxf/trunk/rt:
frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JAXBElementProvider.java
rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/JSONProvider.java
Author: sergeyb
Date: Wed May 2 15:54:05 2012
New Revision: 1333086
URL: http://svn.apache.org/viewvc?rev=1333086&view=rev
Log:
[CXF-4284] Updates to JAXB-based providers to get 400 reported in case of various read errors
Modified:
cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JAXBElementProvider.java
cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/JSONProvider.java
Modified: cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JAXBElementProvider.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JAXBElementProvider.java?rev=1333086&r1=1333085&r2=1333086&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JAXBElementProvider.java (original)
+++ cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JAXBElementProvider.java Wed May 2 15:54:05 2012
@@ -200,7 +200,7 @@ public class JAXBElementProvider<T> exte
throw e;
} catch (Exception e) {
LOG.warning(getStackTrace(e));
- throw new WebApplicationException(e);
+ throw new WebApplicationException(e, Response.status(400).build());
}
// unreachable
return null;
Modified: cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/JSONProvider.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/JSONProvider.java?rev=1333086&r1=1333085&r2=1333086&view=diff
==============================================================================
--- cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/JSONProvider.java (original)
+++ cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/JSONProvider.java Wed May 2 15:54:05 2012
@@ -44,6 +44,7 @@ import javax.ws.rs.WebApplicationExcepti
import javax.ws.rs.core.Context;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.core.Response;
import javax.ws.rs.ext.Provider;
import javax.xml.bind.JAXBElement;
import javax.xml.bind.JAXBException;
@@ -238,11 +239,11 @@ public class JSONProvider<T> extends Abs
} catch (DepthExceededStaxException e) {
throw new WebApplicationException(413);
} catch (XMLStreamException e) {
- throw new WebApplicationException(e);
+ throw new WebApplicationException(e, Response.status(400).build());
} catch (WebApplicationException e) {
throw e;
} catch (Exception e) {
- throw new WebApplicationException(e);
+ throw new WebApplicationException(e, Response.status(400).build());
}
// unreachable
return null;