cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject [4/4] cxf git commit: Fixing merge
Date Fri, 25 Sep 2015 10:48:01 GMT
Fixing merge


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/f129e0b7
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/f129e0b7
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/f129e0b7

Branch: refs/heads/3.0.x-fixes
Commit: f129e0b783cd426ff5836944ed23303bdcac5ce6
Parents: a5474c5
Author: Colm O hEigeartaigh <coheigea@apache.org>
Authored: Fri Sep 25 11:47:48 2015 +0100
Committer: Colm O hEigeartaigh <coheigea@apache.org>
Committed: Fri Sep 25 11:47:48 2015 +0100

----------------------------------------------------------------------
 .../cxf/ws/security/wss4j/PolicyBasedWSS4JInInterceptor.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/f129e0b7/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JInInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JInInterceptor.java
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JInInterceptor.java
index 27ac84b..ec0086a 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JInInterceptor.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JInInterceptor.java
@@ -658,7 +658,7 @@ public class PolicyBasedWSS4JInInterceptor extends WSS4JInInterceptor
{
                 (String)message.getContextualProperty(SecurityConstants.SYMMETRIC_SIGNATURE_ALGORITHM);
             if (asymSignatureAlgorithm != null || symSignatureAlgorithm != null) {
                 Collection<AssertionInfo> algorithmSuites = 
-                    PolicyUtils.getAllAssertionsByLocalname(aim, SPConstants.ALGORITHM_SUITE);
+                    getAllAssertionsByLocalname(aim, SPConstants.ALGORITHM_SUITE);
                 if (algorithmSuites != null && !algorithmSuites.isEmpty()) {
                     for (AssertionInfo algorithmSuite : algorithmSuites) {
                         AlgorithmSuite algSuite = (AlgorithmSuite)algorithmSuite.getAssertion();


Mime
View raw message