Author: sergeyb Date: Tue Feb 7 10:27:37 2012 New Revision: 1241413 URL: http://svn.apache.org/viewvc?rev=1241413&view=rev Log: Merged revisions 1241412 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
................ r1241412 | sergeyb | 2012-02-07 10:24:34 +0000 (Tue, 07 Feb 2012) | 9 lines Merged revisions 1241195 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1241195 | sergeyb | 2012-02-06 21:40:21 +0000 (Mon, 06 Feb 2012) | 1 line [CXF-4088] Checking getGenericSuperclass when selecting providers ........ ................ Modified: cxf/branches/2.4.x-fixes/ (props changed) cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/ProviderFactoryTest.java Propchange: cxf/branches/2.4.x-fixes/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Tue Feb 7 10:27:37 2012 @@ -0,0 +1,2 @@ +/cxf/branches/2.5.x-fixes:1241412 +/cxf/trunk:1241195 Propchange: cxf/branches/2.4.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java?rev=1241413&r1=1241412&r2=1241413&view=diff ============================================================================== --- cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java (original) +++ cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java Tue Feb 7 10:27:37 2012 @@ -882,6 +882,10 @@ public final class ProviderFactory { if (Object.class == cls) { return new Type[]{}; } + Type genericSuperCls = cls.getGenericSuperclass(); + if (genericSuperCls instanceof ParameterizedType) { + return new Type[]{genericSuperCls}; + } Type[] types = cls.getGenericInterfaces(); if (types.length > 0) { return types; Modified: cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/ProviderFactoryTest.java URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/ProviderFactoryTest.java?rev=1241413&r1=1241412&r2=1241413&view=diff ============================================================================== --- cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/ProviderFactoryTest.java (original) +++ cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/ProviderFactoryTest.java Tue Feb 7 10:27:37 2012 @@ -391,7 +391,6 @@ public class ProviderFactoryTest extends } @Test - @Ignore public void testExceptionMappersHierarchyWithGenerics() throws Exception { ProviderFactory pf = ProviderFactory.getInstance(); RuntimeExceptionMapper1 exMapper1 = new RuntimeExceptionMapper1();
