svn commit: r1241193 - in /cxf/branches/2.5.x-fixes: ./ rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/ProviderFactoryTest.java

[dkulp]

Author: dkulp
Date: Mon Feb  6 21:36:07 2012
New Revision: 1241193

URL: http://svn.apache.org/viewvc?rev=1241193&view=rev
Log:
Merged revisions 1240200 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1240200 | dkulp | 2012-02-03 09:51:23 -0500 (Fri, 03 Feb 2012) | 1 line
  
  Properly restolve the raw types.
........

Modified:
    cxf/branches/2.5.x-fixes/   (props changed)
    
cxf/branches/2.5.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java
    
cxf/branches/2.5.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/ProviderFactoryTest.java

Propchange: cxf/branches/2.5.x-fixes/
            ('svn:mergeinfo' removed)

Propchange: cxf/branches/2.5.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
cxf/branches/2.5.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java?rev=1241193&r1=1241192&r2=1241193&view=diff
==============================================================================
--- 
cxf/branches/2.5.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java
 (original)
+++ 
cxf/branches/2.5.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java
 Mon Feb  6 21:36:07 2012
@@ -220,7 +220,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/branches/2.5.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/ProviderFactoryTest.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/ProviderFactoryTest.java?rev=1241193&r1=1241192&r2=1241193&view=diff
==============================================================================
--- 
cxf/branches/2.5.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/ProviderFactoryTest.java
 (original)
+++ 
cxf/branches/2.5.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/ProviderFactoryTest.java
 Mon Feb  6 21:36:07 2012
@@ -620,9 +620,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);
     }