Author: dkulp Date: Tue Dec 15 22:42:13 2009 New Revision: 891053 URL: http://svn.apache.org/viewvc?rev=891053&view=rev Log: Merged revisions 891045 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.2.x-fixes
................ r891045 | dkulp | 2009-12-15 17:33:53 -0500 (Tue, 15 Dec 2009) | 9 lines 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.1.x-fixes/ (props changed) cxf/branches/2.1.x-fixes/api/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java Propchange: cxf/branches/2.1.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.1.x-fixes/api/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/api/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java?rev=891053&r1=891052&r2=891053&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/api/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java (original) +++ cxf/branches/2.1.x-fixes/api/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java Tue Dec 15 22:42:13 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); } }
