cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1240200 - in /cxf/trunk/rt/frontend/jaxrs/src: main/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java test/java/org/apache/cxf/jaxrs/provider/ProviderFactoryTest.java
Date Fri, 03 Feb 2012 14:51:23 GMT
Author: dkulp
Date: Fri Feb  3 14:51:23 2012
New Revision: 1240200

URL: http://svn.apache.org/viewvc?rev=1240200&view=rev
Log:
Properly restolve the raw types.

Modified:
    cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java
    cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/ProviderFactoryTest.java

Modified: cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java?rev=1240200&r1=1240199&r2=1240200&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java
(original)
+++ cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java
Fri Feb  3 14:51:23 2012
@@ -221,7 +221,7 @@ public final class ProviderFactory {
             return candidates.get(0);
         } else {
             Collections.sort(candidates, new ClassComparator());
-            return new ContextResolverProxy(candidates);
+            return new ContextResolverProxy<T>(candidates);
         }
         
     }

Modified: cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/ProviderFactoryTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/ProviderFactoryTest.java?rev=1240200&r1=1240199&r2=1240200&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/ProviderFactoryTest.java
(original)
+++ cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/ProviderFactoryTest.java
Fri Feb  3 14:51:23 2012
@@ -608,9 +608,9 @@ public class ProviderFactoryTest extends
         Message message = prepareMessage("text/xml+*", null);
         ContextResolver<JAXBContext> cr = pf.createContextResolver(JAXBContext.class,
message);
         assertTrue(cr instanceof ProviderFactory.ContextResolverProxy);
-        assertTrue(((ProviderFactory.ContextResolverProxy)cr).getResolvers().get(0) 
+        assertTrue(((ProviderFactory.ContextResolverProxy<?>)cr).getResolvers().get(0)

                    instanceof JAXBContextProvider);
-        assertTrue(((ProviderFactory.ContextResolverProxy)cr).getResolvers().get(1) 
+        assertTrue(((ProviderFactory.ContextResolverProxy<?>)cr).getResolvers().get(1)

                    instanceof JAXBContextProvider2);
     }
     



Mime
View raw message