cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1208097 - in /cxf/trunk/rt: core/src/main/java/org/apache/cxf/interceptor/FaultOutInterceptor.java frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WebFaultOutInterceptor.java
Date Tue, 29 Nov 2011 21:57:18 GMT
Author: dkulp
Date: Tue Nov 29 21:57:17 2011
New Revision: 1208097

URL: http://svn.apache.org/viewvc?rev=1208097&view=rev
Log:
[CXF-3925] Add some NPE guards on the fault chain

Modified:
    cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/FaultOutInterceptor.java
    cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WebFaultOutInterceptor.java

Modified: cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/FaultOutInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/FaultOutInterceptor.java?rev=1208097&r1=1208096&r2=1208097&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/FaultOutInterceptor.java (original)
+++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/FaultOutInterceptor.java Tue
Nov 29 21:57:17 2011
@@ -51,6 +51,9 @@ public class FaultOutInterceptor extends
 
     public void handleMessage(Message message) throws Fault {
         Fault f = (Fault)message.getContent(Exception.class);
+        if (f == null) {
+            return;
+        }
 
         Throwable cause = f.getCause();
         if (cause == null) {

Modified: cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WebFaultOutInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WebFaultOutInterceptor.java?rev=1208097&r1=1208096&r2=1208097&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WebFaultOutInterceptor.java
(original)
+++ cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WebFaultOutInterceptor.java
Tue Nov 29 21:57:17 2011
@@ -79,6 +79,9 @@ public class WebFaultOutInterceptor exte
     
     public void handleMessage(Message message) throws Fault {
         Fault f = (Fault)message.getContent(Exception.class);
+        if (f == null) {
+            return;
+        }
 
         Throwable cause = f.getCause();
         WebFault fault = null;



Mime
View raw message