cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r757971 - in /cxf/branches/2.1.x-fixes: ./ rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/AbstractPolicyInterceptor.java
Date Tue, 24 Mar 2009 19:25:59 GMT
Author: dkulp
Date: Tue Mar 24 19:25:58 2009
New Revision: 757971

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

........
  r757859 | dkulp | 2009-03-24 11:50:30 -0400 (Tue, 24 Mar 2009) | 2 lines
  
  [CXF-2129] Add NPE guard.  Patch from   Alessio Soldano applied.
........

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

Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 24 19:25:58 2009
@@ -1 +1 @@
-/cxf/trunk:753380,753397,753421,754585,755365
+/cxf/trunk:753380,753397,753421,754585,755365,757859

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=757971&r1=757970&r2=757971&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 Mar 24 19:25:58 2009
@@ -85,7 +85,7 @@
             }
             for (BindingFaultInfo b : boi.getFaults()) {
                 Class<?> faultClass = b.getFaultInfo().getProperty(Class.class.getName(),
Class.class);
-                if (faultClass.isAssignableFrom(cause.getClass())) {
+                if (faultClass != null && faultClass.isAssignableFrom(cause.getClass()))
{
                     bfi = b;
                     msg.put(BindingFaultInfo.class, bfi);
                     break;
@@ -94,7 +94,7 @@
             if (null == bfi && null != boi.getWrappedOperation()) {
                 for (BindingFaultInfo b : boi.getWrappedOperation().getFaults()) {
                     Class<?> faultClass = b.getFaultInfo().getProperty(Class.class.getName(),
Class.class);
-                    if (faultClass.isAssignableFrom(cause.getClass())) {
+                    if (faultClass != null && faultClass.isAssignableFrom(cause.getClass()))
{
                         bfi = b;
                         msg.put(BindingFaultInfo.class, bfi);
                         break;



Mime
View raw message