Author: ema Date: Tue Jan 15 08:15:04 2013 New Revision: 1433309 URL: http://svn.apache.org/viewvc?rev=1433309&view=rev Log: Merged revisions 1433306 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes
................ r1433306 | ema | 2013-01-15 16:09:33 +0800 (Tue, 15 Jan 2013) | 9 lines Merged revisions 1433305 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1433305 | ema | 2013-01-15 16:04:51 +0800 (Tue, 15 Jan 2013) | 1 line CXF-4755- StackOverflowError when ASMHelper tries to getClassCode from a parametrized type <E extends Enum> ........ ................ Added: cxf/branches/2.6.x-fixes/api/src/test/java/org/apache/cxf/common/util/ASMHelperTest.java - copied unchanged from r1433306, cxf/branches/2.7.x-fixes/api/src/test/java/org/apache/cxf/common/util/ASMHelperTest.java Modified: cxf/branches/2.6.x-fixes/ (props changed) cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/common/util/ASMHelper.java Propchange: cxf/branches/2.6.x-fixes/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Tue Jan 15 08:15:04 2013 @@ -0,0 +1,2 @@ +/cxf/branches/2.7.x-fixes:1433306 +/cxf/trunk:1433305 Propchange: cxf/branches/2.6.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/common/util/ASMHelper.java URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/common/util/ASMHelper.java?rev=1433309&r1=1433308&r2=1433309&view=diff ============================================================================== --- cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/common/util/ASMHelper.java (original) +++ cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/common/util/ASMHelper.java Tue Jan 15 08:15:04 2013 @@ -192,12 +192,15 @@ public class ASMHelper { } else if (type instanceof ParameterizedType) { ParameterizedType pt = (ParameterizedType)type; StringBuilder a = new StringBuilder(getClassCode(pt.getRawType())); - a.setLength(a.length() - 1); - a.append('<'); - for (java.lang.reflect.Type t : pt.getActualTypeArguments()) { - a.append(getClassCode(t)); + if (!pt.getRawType().equals(Enum.class)) { + a.setLength(a.length() - 1); + a.append('<'); + + for (java.lang.reflect.Type t : pt.getActualTypeArguments()) { + a.append(getClassCode(t)); + } + a.append(">;"); } - a.append(">;"); return a.toString(); } else if (type instanceof WildcardType) { WildcardType wt = (WildcardType)type;
