cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r891045 - in /cxf/branches/2.2.x-fixes: ./ api/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java
Date Tue, 15 Dec 2009 22:33:53 GMT
Author: dkulp
Date: Tue Dec 15 22:33:53 2009
New Revision: 891045

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

........
  r891037 | dkulp | 2009-12-15 17:27:32 -0500 (Tue, 15 Dec 2009) | 1 line
  
  Add an NPE guard
........

Modified:
    cxf/branches/2.2.x-fixes/   (props changed)
    cxf/branches/2.2.x-fixes/api/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java

Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Dec 15 22:33:53 2009
@@ -1 +1 @@
-/cxf/trunk:890614,890633-890756,890819,890957,891036
+/cxf/trunk:890614,890633-890756,890819,890957,891036-891037

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

Modified: cxf/branches/2.2.x-fixes/api/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/api/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java?rev=891045&r1=891044&r2=891045&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/api/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java
(original)
+++ cxf/branches/2.2.x-fixes/api/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java
Tue Dec 15 22:33:53 2009
@@ -297,12 +297,14 @@
                         }
     
                         message.setContent(Exception.class, ex);
+                        boolean isOneWay = false;
                         if (message.getExchange() != null) {
                             message.getExchange().put(Exception.class, ex);
+                            isOneWay = message.getExchange().isOneWay();
                         }                    
                         unwind(message);
                         
-                        if (faultObserver != null && !message.getExchange().isOneWay())
{
+                        if (faultObserver != null && !isOneWay) {
                             faultObserver.onMessage(message);
                         }
                     }



Mime
View raw message