cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r678893 - /cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java
Date Tue, 22 Jul 2008 20:48:53 GMT
Author: dkulp
Date: Tue Jul 22 13:48:52 2008
New Revision: 678893

URL: http://svn.apache.org/viewvc?rev=678893&view=rev
Log:
[CXF-1697] Add calendars to the stuff allowed to be unmarshalled by class

Modified:
    cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java

Modified: cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java?rev=678893&r1=678892&r2=678893&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java
(original)
+++ cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java
Tue Jul 22 13:48:52 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.Set;
@@ -514,8 +515,12 @@
             boolean unmarshalWithClass = true;
 
             if (clazz == null
-                || (!clazz.isPrimitive() && !clazz.isArray() && !clazz.isEnum()
&& (Modifier.isAbstract(clazz
-                    .getModifiers()) || Modifier.isInterface(clazz.getModifiers())))) {
+                || (!clazz.isPrimitive() 
+                    && !clazz.isArray() 
+                    && !clazz.isEnum() 
+                    && !clazz.equals(Calendar.class)
+                    && (Modifier.isAbstract(clazz.getModifiers()) 
+                        || Modifier.isInterface(clazz.getModifiers())))) {
                 unmarshalWithClass = false;
             }
 



Mime
View raw message