cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e..@apache.org
Subject svn commit: r1436741 - /cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java
Date Tue, 22 Jan 2013 04:02:14 GMT
Author: ema
Date: Tue Jan 22 04:02:14 2013
New Revision: 1436741

URL: http://svn.apache.org/viewvc?rev=1436741&view=rev
Log:
CXF-4773 - StackOverflowError when JAXBSchemaInitializer tries to process parametrized type
Enum<E>

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

Modified: cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java?rev=1436741&r1=1436740&r2=1436741&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java
(original)
+++ cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java
Tue Jan 22 04:02:14 2013
@@ -223,8 +223,10 @@ class JAXBContextInitializer extends Ser
             }
         } else if (cls instanceof ParameterizedType) {
             addType(((ParameterizedType)cls).getRawType());
-            for (Type t2 : ((ParameterizedType)cls).getActualTypeArguments()) {
-                addType(t2);
+            if (!((ParameterizedType)cls).getRawType().equals(Enum.class)) {
+                for (Type t2 : ((ParameterizedType)cls).getActualTypeArguments()) {
+                    addType(t2);
+                }
             }
         } else if (cls instanceof GenericArrayType) {
             Class<?> ct;



Mime
View raw message