You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2015/08/05 13:28:27 UTC
[1/2] cxf git commit: Make sure to throw an exception if the
AlgorithmSuite is not recognised
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 <co...@apache.org>
Authored: Wed Aug 5 12:14:52 2015 +0100
Committer: Colm O hEigeartaigh <co...@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"
[2/2] cxf git commit: Recording .gitmergeinfo Changes
Posted by co...@apache.org.
Recording .gitmergeinfo Changes
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/327f95b2
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/327f95b2
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/327f95b2
Branch: refs/heads/3.0.x-fixes
Commit: 327f95b2420483fb14cedee018d65460481006ac
Parents: 8028c0f
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Wed Aug 5 12:28:16 2015 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Wed Aug 5 12:28:16 2015 +0100
----------------------------------------------------------------------
.gitmergeinfo | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/327f95b2/.gitmergeinfo
----------------------------------------------------------------------
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 4e7b4b0..9f0d0be 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -434,6 +434,7 @@ B fd5abbd3793e232638e4d0793ebb9765e49c638a
B fde8db305f362bd413d2b0f5dcdbb65917cc39a9
B fe416234bab8af30f1789c3164ac256af86e3b62
B ff742436a3e177dc61106edf08f2509e727362dd
+B ff8260927ee55a38a477b4206ec41c16bdb8015d
B ff956909f7e8d107407f7eb11e5459e7c658f5ab
B ffb10f12d5b84cef8fbd411da3d3fd54729f4893
B ffc766ccd1d800c10d8ee52c74d69087dcc19c62