Author: dkulp
Date: Tue Mar 24 15:50:30 2009
New Revision: 757859

URL: http://svn.apache.org/viewvc?rev=757859&view=rev
Log:
[CXF-2129] Add NPE guard.  Patch from   Alessio Soldano applied.

Modified:
    
cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/AbstractPolicyInterceptor.java

Modified: 
cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/AbstractPolicyInterceptor.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/AbstractPolicyInterceptor.java?rev=757859&r1=757858&r2=757859&view=diff
==============================================================================
--- 
cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/AbstractPolicyInterceptor.java
 (original)
+++ 
cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/AbstractPolicyInterceptor.java
 Tue Mar 24 15:50:30 2009
@@ -74,7 +74,7 @@
             }
             for (BindingFaultInfo b : boi.getFaults()) {
                 Class<?> faultClass = 
b.getFaultInfo().getProperty(Class.class.getName(), Class.class);
-                if (faultClass.isAssignableFrom(cause.getClass())) {
+                if (faultClass != null && 
faultClass.isAssignableFrom(cause.getClass())) {
                     bfi = b;
                     msg.put(BindingFaultInfo.class, bfi);
                     break;
@@ -83,7 +83,7 @@
             if (null == bfi && null != boi.getWrappedOperation()) {
                 for (BindingFaultInfo b : 
boi.getWrappedOperation().getFaults()) {
                     Class<?> faultClass = 
b.getFaultInfo().getProperty(Class.class.getName(), Class.class);
-                    if (faultClass.isAssignableFrom(cause.getClass())) {
+                    if (faultClass != null && 
faultClass.isAssignableFrom(cause.getClass())) {
                         bfi = b;
                         msg.put(BindingFaultInfo.class, bfi);
                         break;


Reply via email to