svn commit: r1328316 - /cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/AbstractBindingPolicyValidator.java

[coheigea]

Author: coheigea
Date: Fri Apr 20 10:53:44 2012
New Revision: 1328316

URL: http://svn.apache.org/viewvc?rev=1328316&view=rev
Log:
Avoid NPE when checking OnlySignEntireHeadersAndBody Element when a STR 
Transform is used in the Signature

Modified:
    
cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/AbstractBindingPolicyValidator.java

Modified: 
cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/AbstractBindingPolicyValidator.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/AbstractBindingPolicyValidator.java?rev=1328316&r1=1328315&r2=1328316&view=diff
==============================================================================
--- 
cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/AbstractBindingPolicyValidator.java
 (original)
+++ 
cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/AbstractBindingPolicyValidator.java
 Fri Apr 20 10:53:44 2012
@@ -114,12 +114,14 @@ public abstract class AbstractBindingPol
                     
CastUtils.cast((List<?>)signedResult.get(WSSecurityEngineResult.TAG_DATA_REF_URIS));
             for (WSDataRef dataRef : dataRefs) {
                 String xpath = dataRef.getXpath();
-                String[] nodes = xpath.split("/");
-                // envelope/Body || envelope/Header/header || 
envelope/Header/wsse:Security/header
-                if (nodes.length == 5 && nodes[3].contains("Security")) {
-                    continue;
-                } else if (nodes.length < 3 || nodes.length > 4) {
-                    return false;
+                if (xpath != null) {
+                    String[] nodes = xpath.split("/");
+                    // envelope/Body || envelope/Header/header || 
envelope/Header/wsse:Security/header
+                    if (nodes.length == 5 && nodes[3].contains("Security")) {
+                        continue;
+                    } else if (nodes.length < 3 || nodes.length > 4) {
+                        return false;
+                    }
                 }
             }
         }