svn commit: r1563198 - /cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java

[sergeyb]

Author: sergeyb
Date: Fri Jan 31 18:24:34 2014
New Revision: 1563198

URL: http://svn.apache.org/r1563198
Log:
[CXF-5348] Preventing NPE

Modified:
    
cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderFactory.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=1563198&r1=1563197&r2=1563198&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 Jan 31 18:24:34 2014
@@ -1003,7 +1003,7 @@ public abstract class ProviderFactory {
                 Class<?> actualType = 
InjectionUtils.getActualType(genericSuperType);
                 if (expectedClass == actualType) {
                     return new Type[]{genericSuperType};
-                } else if (expectedClass.isAssignableFrom(actualType)) {
+                } else if (actualType != null && 
expectedClass.isAssignableFrom(actualType)) {
                     return new Type[]{};    
                 }
             }