You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2008/07/22 22:51:23 UTC
svn commit: r678896 - in /cxf/branches/2.0.x-fixes: ./
rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java
Author: dkulp
Date: Tue Jul 22 13:51:23 2008
New Revision: 678896
URL: http://svn.apache.org/viewvc?rev=678896&view=rev
Log:
Merged revisions 678893 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r678893 | dkulp | 2008-07-22 16:48:52 -0400 (Tue, 22 Jul 2008) | 2 lines
[CXF-1697] Add calendars to the stuff allowed to be unmarshalled by class
........
Modified:
cxf/branches/2.0.x-fixes/ (props changed)
cxf/branches/2.0.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java
Propchange: cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jul 22 13:51:23 2008
@@ -1 +1 @@
-/cxf/trunk:673548,674485,674547,674551,674562,674601,674649,674764,674887,675644,675653,677048,677385,678004,678009,678559,678629,678808,678852,678891
+/cxf/trunk:673548,674485,674547,674551,674562,674601,674649,674764,674887,675644,675653,677048,677385,678004,678009,678559,678629,678808,678852,678891,678893
Propchange: cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.0.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java?rev=678896&r1=678895&r2=678896&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java (original)
+++ cxf/branches/2.0.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java Tue Jul 22 13:51:23 2008
@@ -31,6 +31,7 @@
import java.lang.reflect.Type;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Calendar;
import java.util.Collection;
import java.util.List;
import java.util.Map;
@@ -559,10 +560,14 @@
u.setAttachmentUnmarshaller(au);
}
boolean unmarshalWithClass = true;
-
- if (clazz == null || (!clazz.isPrimitive() && !clazz.isArray() && !clazz.isEnum()
- && (Modifier.isAbstract(clazz.getModifiers())
- || Modifier.isInterface(clazz.getModifiers())))) {
+
+ if (clazz == null
+ || (!clazz.isPrimitive()
+ && !clazz.isArray()
+ && !clazz.isEnum()
+ && !clazz.equals(Calendar.class)
+ && (Modifier.isAbstract(clazz.getModifiers())
+ || Modifier.isInterface(clazz.getModifiers())))) {
unmarshalWithClass = false;
}