cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1208166 - in /cxf/branches/2.4.x-fixes: ./ rt/core/src/main/java/org/apache/cxf/interceptor/FaultOutInterceptor.java rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WebFaultOutInterceptor.java
Date Wed, 30 Nov 2011 00:59:26 GMT
Author: dkulp
Date: Wed Nov 30 00:59:25 2011
New Revision: 1208166

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

........
  r1208097 | dkulp | 2011-11-29 16:57:17 -0500 (Tue, 29 Nov 2011) | 1 line
  
  [CXF-3925] Add some NPE guards on the fault chain
........

Modified:
    cxf/branches/2.4.x-fixes/   (props changed)
    cxf/branches/2.4.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/FaultOutInterceptor.java
    cxf/branches/2.4.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WebFaultOutInterceptor.java

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

Modified: cxf/branches/2.4.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/FaultOutInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/FaultOutInterceptor.java?rev=1208166&r1=1208165&r2=1208166&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/FaultOutInterceptor.java
(original)
+++ cxf/branches/2.4.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/FaultOutInterceptor.java
Wed Nov 30 00:59:25 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/branches/2.4.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WebFaultOutInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WebFaultOutInterceptor.java?rev=1208166&r1=1208165&r2=1208166&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WebFaultOutInterceptor.java
(original)
+++ cxf/branches/2.4.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WebFaultOutInterceptor.java
Wed Nov 30 00:59:25 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