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:01 UTC

[2/4] cxf git commit: NPE fix

NPE fix


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

Branch: refs/heads/master
Commit: 91c310b78d208d778a4918056c8e28f8e323eed9
Parents: b510153
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:20:56 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/91c310b7/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 6534394..0bb2900 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 =