Author: dkulp Date: Tue Dec 8 02:47:56 2009 New Revision: 888234 URL: http://svn.apache.org/viewvc?rev=888234&view=rev Log: Merged revisions 888118 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.2.x-fixes
................ r888118 | dkulp | 2009-12-07 15:20:02 -0500 (Mon, 07 Dec 2009) | 9 lines Merged revisions 888105 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r888105 | dkulp | 2009-12-07 14:40:51 -0500 (Mon, 07 Dec 2009) | 1 line Add an NPE guard ........ ................ Modified: cxf/branches/2.1.x-fixes/ (props changed) cxf/branches/2.1.x-fixes/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/AbstractPolicyInterceptor.java cxf/branches/2.1.x-fixes/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyVerificationInFaultInterceptor.java Propchange: cxf/branches/2.1.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.1.x-fixes/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/AbstractPolicyInterceptor.java URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/AbstractPolicyInterceptor.java?rev=888234&r1=888233&r2=888234&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/AbstractPolicyInterceptor.java (original) +++ cxf/branches/2.1.x-fixes/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/AbstractPolicyInterceptor.java Tue Dec 8 02:47:56 2009 @@ -78,7 +78,7 @@ protected BindingFaultInfo getBindingFaultInfo(Message msg, Exception ex, BindingOperationInfo boi) { BindingFaultInfo bfi = msg.get(BindingFaultInfo.class); - if (null == bfi) { + if (null == bfi && ex != null) { Throwable cause = ex.getCause(); if (null == cause) { return null; Modified: cxf/branches/2.1.x-fixes/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyVerificationInFaultInterceptor.java URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyVerificationInFaultInterceptor.java?rev=888234&r1=888233&r2=888234&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyVerificationInFaultInterceptor.java (original) +++ cxf/branches/2.1.x-fixes/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyVerificationInFaultInterceptor.java Tue Dec 8 02:47:56 2009 @@ -87,7 +87,6 @@ if (null == ex) { ex = exchange.get(Exception.class); } - assert null != ex; BindingFaultInfo bfi = getBindingFaultInfo(message, ex, boi); if (null == bfi) {
