cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e..@apache.org
Subject svn commit: r1436742 - in /cxf/branches/2.7.x-fixes: ./ rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java
Date Tue, 22 Jan 2013 04:04:51 GMT
Author: ema
Date: Tue Jan 22 04:04:51 2013
New Revision: 1436742

URL: http://svn.apache.org/viewvc?rev=1436742&view=rev
Log:
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.7.x-fixes/   (props changed)
    cxf/branches/2.7.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java

Propchange: cxf/branches/2.7.x-fixes/
------------------------------------------------------------------------------
    svn:mergeinfo = /cxf/trunk:1436741

Propchange: cxf/branches/2.7.x-fixes/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Jan 22 04:04:51 2013
@@ -1 +1 @@
-/cxf/trunk:1-1430398,1430564,1430881-1430882,1430905,1430965,1430976,1431315,1431604-1431607,1432070,1432236,1432798,1433007,1433033,1433135,1433305,1433347,1433895,1434042,1434124,1434564,1435034,1435111,1435223,1435354,1436208,1436276,1436293
+/cxf/trunk:1-1430398,1430564,1430881-1430882,1430905,1430965,1430976,1431315,1431604-1431607,1432070,1432236,1432798,1433007,1433033,1433135,1433305,1433347,1433895,1434042,1434124,1434564,1435034,1435111,1435223,1435354,1436208,1436276,1436293,1436741

Modified: cxf/branches/2.7.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java?rev=1436742&r1=1436741&r2=1436742&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java
(original)
+++ cxf/branches/2.7.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java
Tue Jan 22 04:04:51 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