cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject [1/2] cxf git commit: Make sure to throw an exception if the AlgorithmSuite is not recognised
Date Wed, 05 Aug 2015 11:28:27 GMT
Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes 9956be7a4 -> 327f95b24


Make sure to throw an exception if the AlgorithmSuite is not recognised


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

Branch: refs/heads/3.0.x-fixes
Commit: 8028c0fb3e2b9d23a632f664c8d0ff04b1ffb337
Parents: 9956be7
Author: Colm O hEigeartaigh <coheigea@apache.org>
Authored: Wed Aug 5 12:14:52 2015 +0100
Committer: Colm O hEigeartaigh <coheigea@apache.org>
Committed: Wed Aug 5 12:28:14 2015 +0100

----------------------------------------------------------------------
 .../cxf/ws/security/policy/custom/AlgorithmSuiteBuilder.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/8028c0fb/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 56b650d..d5ce360 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
@@ -57,7 +57,7 @@ public class AlgorithmSuiteBuilder implements AssertionBuilder<Element>
{
             loader = new DefaultAlgorithmSuiteLoader();
         }
         AlgorithmSuite algorithmSuite = loader.getAlgorithmSuite(bus, spVersion, nestedPolicy);
-        if (algorithmSuite == null) {
+        if (algorithmSuite == null || algorithmSuite.getAlgorithmSuiteType() == null) {
             String algorithmSuiteName = DOMUtils.getFirstElement(nestedPolicyElement).getLocalName();
             throw new IllegalArgumentException(
                 "Algorithm suite \"" + algorithmSuiteName + "\" is not registered"


Mime
View raw message