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 2016/02/15 17:21:43 UTC
[1/2] cxf git commit: NPE fix
Repository: cxf
Updated Branches:
refs/heads/3.0.x-fixes 89e4e97a4 -> 694b2e6f5
NPE fix
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/957d4024
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/957d4024
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/957d4024
Branch: refs/heads/3.0.x-fixes
Commit: 957d402444adc067f29b3f3ca63145f100eb1397
Parents: 89e4e97
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Mon Feb 15 16:06:52 2016 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Mon Feb 15 16:21:37 2016 +0000
----------------------------------------------------------------------
.../src/main/java/org/apache/cxf/sts/claims/ClaimsManager.java | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/957d4024/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/ClaimsManager.java
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/ClaimsManager.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/ClaimsManager.java
index 5568d33..a733758 100644
--- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/ClaimsManager.java
+++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/ClaimsManager.java
@@ -183,6 +183,10 @@ public class ClaimsManager {
ProcessedClaimCollection returnCollection = new ProcessedClaimCollection();
Principal originalPrincipal = parameters.getPrincipal();
+ if (claimHandlers == null) {
+ return returnCollection;
+ }
+
for (ClaimsHandler handler : claimHandlers) {
ClaimCollection supportedClaims =
[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/694b2e6f
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/694b2e6f
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/694b2e6f
Branch: refs/heads/3.0.x-fixes
Commit: 694b2e6f564178f856eecebfc90382d949f1ae9e
Parents: 957d402
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Mon Feb 15 16:21:38 2016 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Mon Feb 15 16:21:38 2016 +0000
----------------------------------------------------------------------
.gitmergeinfo | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/694b2e6f/.gitmergeinfo
----------------------------------------------------------------------
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 22b3898..f22fba7 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -633,6 +633,7 @@ B cec8828bd220abd0d49457df707b9261b50e1a8e
B d021b9041e00518099947274455b2027326a3c7c
B d04f83cecea57d92052f3bf1f4eea7f4adfac6c6
B d0c5c3defab6dbb9619f8fd291f2e06b685cb03c
+B d1bb6c14ce0e9431adedc324bcf069209d9fe4d8
B d1c7f1f6be4ce14bd0e99ec9672d9c1957515f35
B d2ed88ccb247d4105de34a5b675c0fc198795209
B d2ee79c9371fa23ecd8e2a3a0d907c3256466f28
@@ -776,6 +777,7 @@ B fd3471e58e63ee672babc015ed0929f6cd6862dd
B fd5abbd3793e232638e4d0793ebb9765e49c638a
B fde8db305f362bd413d2b0f5dcdbb65917cc39a9
B fe416234bab8af30f1789c3164ac256af86e3b62
+B fe9e4fbf7d99d8161c1eda0e49647cfcc0c00dc4
B ff4fd0c01aaf8ef1cbdb8707eb50a54d762d640b
B ff693a62de7674464fe28265c48ca07dcdb64026
B ff742436a3e177dc61106edf08f2509e727362dd