You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dv...@apache.org on 2010/09/02 05:56:01 UTC
svn commit: r991799 - in /cxf/branches/2.2.x-fixes: ./
rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JInInterceptor.java
Author: dvaleri
Date: Thu Sep 2 03:56:01 2010
New Revision: 991799
URL: http://svn.apache.org/viewvc?rev=991799&view=rev
Log:
Merged revisions 991797 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r991797 | dvaleri | 2010-09-01 23:41:16 -0400 (Wed, 01 Sep 2010) | 1 line
[CXF-2968] Changed operation to use DOMUtils instead of SAAJ operation.
........
Modified:
cxf/branches/2.2.x-fixes/ (props changed)
cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JInInterceptor.java
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 2 03:56:01 2010
@@ -1 +1 @@
-/cxf/trunk:989123,989434,990386,990593,991324,991416
+/cxf/trunk:989123,989434,990386,990593,991324,991416,991797
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JInInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JInInterceptor.java?rev=991799&r1=991798&r2=991799&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JInInterceptor.java (original)
+++ cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JInInterceptor.java Thu Sep 2 03:56:01 2010
@@ -48,6 +48,7 @@ import org.apache.cxf.common.classloader
import org.apache.cxf.common.util.StringUtils;
import org.apache.cxf.endpoint.Endpoint;
import org.apache.cxf.helpers.CastUtils;
+import org.apache.cxf.helpers.DOMUtils;
import org.apache.cxf.helpers.MapNamespaceContext;
import org.apache.cxf.resource.ResourceManager;
import org.apache.cxf.service.model.EndpointInfo;
@@ -566,7 +567,7 @@ public class PolicyBasedWSS4JInIntercept
RequiredParts rp = (RequiredParts)ai.getAssertion();
ai.setAsserted(true);
for (Header h : rp.getHeaders()) {
- if (header == null || !header.getChildElements(h.getQName()).hasNext()) {
+ if (header == null || DOMUtils.getFirstChildWithName(header, h.getQName()) == null) {
ai.setNotAsserted("No header element of name " + h.getQName() + " found.");
}
}