Author: ema Date: Tue Jan 22 04:06:47 2013 New Revision: 1436743 URL: http://svn.apache.org/viewvc?rev=1436743&view=rev Log: Merged revisions 1436742 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes
................ r1436742 | ema | 2013-01-22 12:04:51 +0800 (Tue, 22 Jan 2013) | 9 lines Merged revisions 1436741 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1436741 | ema | 2013-01-22 12:02:14 +0800 (Tue, 22 Jan 2013) | 1 line CXF-4773 - StackOverflowError when JAXBSchemaInitializer tries to process parametrized type Enum<E> ........ ................ Modified: cxf/branches/2.6.x-fixes/ (props changed) cxf/branches/2.6.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java Propchange: cxf/branches/2.6.x-fixes/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Tue Jan 22 04:06:47 2013 @@ -0,0 +1,2 @@ +/cxf/branches/2.7.x-fixes:1436742 +/cxf/trunk:1436741 Propchange: cxf/branches/2.6.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.6.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java?rev=1436743&r1=1436742&r2=1436743&view=diff ============================================================================== --- cxf/branches/2.6.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java (original) +++ cxf/branches/2.6.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java Tue Jan 22 04:06:47 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;
