cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject [2/2] cxf git commit: Amending backport
Date Mon, 26 Sep 2016 11:39:08 GMT
Amending backport


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

Branch: refs/heads/3.1.x-fixes
Commit: 4d849ec587eafc4f765a1f6286f745a951aba4bb
Parents: 34fc296
Author: Colm O hEigeartaigh <coheigea@apache.org>
Authored: Mon Sep 26 12:38:55 2016 +0100
Committer: Colm O hEigeartaigh <coheigea@apache.org>
Committed: Mon Sep 26 12:38:55 2016 +0100

----------------------------------------------------------------------
 .../policy/custom/AlgorithmSuiteBuilder.java        | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/4d849ec5/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/custom/AlgorithmSuiteBuilder.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/custom/AlgorithmSuiteBuilder.java
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/custom/AlgorithmSuiteBuilder.java
index 0c7038d..e237c39 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/custom/AlgorithmSuiteBuilder.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/custom/AlgorithmSuiteBuilder.java
@@ -58,13 +58,15 @@ public class AlgorithmSuiteBuilder implements AssertionBuilder<Element>
{
         }
         AlgorithmSuite algorithmSuite = loader.getAlgorithmSuite(bus, spVersion, nestedPolicy);
         if (algorithmSuite == null || algorithmSuite.getAlgorithmSuiteType() == null) {
-            String algorithmSuiteName = null;
-            if (algorithmSuite != null) {
-                algorithmSuiteName = algorithmSuite.getFirstInvalidAlgorithmSuite();
-            }
-            if (algorithmSuiteName == null) {
-                algorithmSuiteName = DOMUtils.getFirstElement(nestedPolicyElement).getLocalName();
-            }
+            // TODO - Make available once we pick up WSS4J 2.1.8/2.0.10
+            //String algorithmSuiteName = null;
+            //if (algorithmSuite != null) {
+                //algorithmSuiteName = algorithmSuite.getFirstInvalidAlgorithmSuite();
+            //}
+            //if (algorithmSuiteName == null) {
+                //algorithmSuiteName = DOMUtils.getFirstElement(nestedPolicyElement).getLocalName();
+            //}
+            String algorithmSuiteName = DOMUtils.getFirstElement(nestedPolicyElement).getLocalName();
             throw new IllegalArgumentException(
                 "Algorithm suite \"" + algorithmSuiteName + "\" is not registered"
             );


Mime
View raw message