Author: asoldano Date: Thu Feb 7 14:53:37 2013 New Revision: 1443520 URL: http://svn.apache.org/viewvc?rev=1443520&view=rev Log: Merged revisions 1443508 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes
................ r1443508 | asoldano | 2013-02-07 15:41:28 +0100 (Thu, 07 Feb 2013) | 9 lines Merged revisions 1443500 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1443500 | asoldano | 2013-02-07 15:20:17 +0100 (Thu, 07 Feb 2013) | 2 lines [CXF-4789] Fix supporting token validation signature check ........ ................ Modified: cxf/branches/2.6.x-fixes/ (props changed) cxf/branches/2.6.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/AbstractSupportingTokenPolicyValidator.java Propchange: cxf/branches/2.6.x-fixes/ ------------------------------------------------------------------------------ Merged /cxf/branches/2.7.x-fixes:r1443508 Merged /cxf/trunk:r1443500 Propchange: cxf/branches/2.6.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.6.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/AbstractSupportingTokenPolicyValidator.java URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/AbstractSupportingTokenPolicyValidator.java?rev=1443520&r1=1443519&r2=1443520&view=diff ============================================================================== --- cxf/branches/2.6.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/AbstractSupportingTokenPolicyValidator.java (original) +++ cxf/branches/2.6.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/AbstractSupportingTokenPolicyValidator.java Thu Feb 7 14:53:37 2013 @@ -539,7 +539,7 @@ public abstract class AbstractSupporting CastUtils.cast((List<?>)signedResult.get( WSSecurityEngineResult.TAG_DATA_REF_URIS )); - if (sl != null && sl.size() == 1) { + if (sl != null && sl.size() >= 1) { for (WSDataRef dataRef : sl) { QName signedQName = dataRef.getName(); if (WSSecurityEngine.SIGNATURE.equals(signedQName)
