svn commit: r891037 - /cxf/trunk/api/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java

[dkulp]

Author: dkulp
Date: Tue Dec 15 22:27:32 2009
New Revision: 891037

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

Modified:
    cxf/trunk/api/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java

Modified: 
cxf/trunk/api/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java?rev=891037&r1=891036&r2=891037&view=diff
==============================================================================
--- cxf/trunk/api/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java 
(original)
+++ cxf/trunk/api/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java 
Tue Dec 15 22:27:32 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);
                         }
                     }