svn commit: r888105 - in /cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy: AbstractPolicyInterceptor.java PolicyVerificationInFaultInterceptor.java

[dkulp]

Author: dkulp
Date: Mon Dec  7 19:40:51 2009
New Revision: 888105

URL: http://svn.apache.org/viewvc?rev=888105&view=rev
Log:
Add an NPE guard

Modified:
    
cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/AbstractPolicyInterceptor.java
    
cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyVerificationInFaultInterceptor.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=888105&r1=888104&r2=888105&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
 Mon Dec  7 19:40:51 2009
@@ -67,7 +67,7 @@
     
     protected BindingFaultInfo getBindingFaultInfo(Message msg, Exception ex, 
BindingOperationInfo boi) {
         BindingFaultInfo bfi = msg.get(BindingFaultInfo.class);        
-        if (null == bfi) {
+        if (null == bfi && ex != null) {
             Throwable cause = ex.getCause();
             if (null == cause) {
                 return null;

Modified: 
cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyVerificationInFaultInterceptor.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyVerificationInFaultInterceptor.java?rev=888105&r1=888104&r2=888105&view=diff
==============================================================================
--- 
cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyVerificationInFaultInterceptor.java
 (original)
+++ 
cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyVerificationInFaultInterceptor.java
 Mon Dec  7 19:40:51 2009
@@ -90,7 +90,6 @@
         if (null == ex) {
             ex = exchange.get(Exception.class);
         }
-        assert null != ex;
         
         BindingFaultInfo bfi = getBindingFaultInfo(message, ex, boi);
         if (null == bfi) {