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 2009/09/15 12:19:05 UTC
svn commit: r815251 - in /cxf/branches/2.2.x-fixes: ./
rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AbstractJAXBProvider.java
Author: sergeyb
Date: Tue Sep 15 10:19:04 2009
New Revision: 815251
URL: http://svn.apache.org/viewvc?rev=815251&view=rev
Log:
Merged revisions 814859 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r814859 | sergeyb | 2009-09-14 22:20:05 +0100 (Mon, 14 Sep 2009) | 1 line
JAXRS : fixing failing JSONProvider tests on jdk 1.6
........
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/AbstractJAXBProvider.java
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
svn:mergeinfo = /cxf/trunk:814859
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/AbstractJAXBProvider.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AbstractJAXBProvider.java?rev=815251&r1=815250&r2=815251&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AbstractJAXBProvider.java (original)
+++ cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AbstractJAXBProvider.java Tue Sep 15 10:19:04 2009
@@ -323,7 +323,7 @@
}
public JAXBContext getPackageContext(Class<?> type) {
- if (type == null) {
+ if (type == null || type == JAXBElement.class) {
return null;
}
synchronized (packageContexts) {