cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject git commit: Some minor fixes
Date Fri, 20 Jun 2014 16:17:02 GMT
Repository: cxf-fediz
Updated Branches:
  refs/heads/master 785697e87 -> e344688ff


Some minor fixes


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

Branch: refs/heads/master
Commit: e344688ff65dfe7cf55981ab70a83e8e7f99bddb
Parents: 785697e
Author: Colm O hEigeartaigh <coheigea@apache.org>
Authored: Fri Jun 20 17:16:53 2014 +0100
Committer: Colm O hEigeartaigh <coheigea@apache.org>
Committed: Fri Jun 20 17:16:53 2014 +0100

----------------------------------------------------------------------
 .../java/org/apache/cxf/fediz/core/saml/SAMLTokenValidator.java | 2 ++
 .../org/apache/cxf/fediz/core/servlet/FederationFilter.java     | 5 ++---
 2 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/e344688f/plugins/core/src/main/java/org/apache/cxf/fediz/core/saml/SAMLTokenValidator.java
----------------------------------------------------------------------
diff --git a/plugins/core/src/main/java/org/apache/cxf/fediz/core/saml/SAMLTokenValidator.java
b/plugins/core/src/main/java/org/apache/cxf/fediz/core/saml/SAMLTokenValidator.java
index b643a4e..b468b5c 100644
--- a/plugins/core/src/main/java/org/apache/cxf/fediz/core/saml/SAMLTokenValidator.java
+++ b/plugins/core/src/main/java/org/apache/cxf/fediz/core/saml/SAMLTokenValidator.java
@@ -230,6 +230,7 @@ public class SAMLTokenValidator implements TokenValidator {
                             roles = parseRoles((String)oValue, delim);
                         }
                     } else if ((oValue instanceof List<?>) && !((List<?>)oValue).isEmpty())
{
+                        @SuppressWarnings("unchecked")
                         List<String> values = (List<String>)oValue;
                         roles = Collections.unmodifiableList(values);
                     } else if (!((oValue instanceof String) || (oValue instanceof List<?>)))
{
@@ -370,6 +371,7 @@ public class SAMLTokenValidator implements TokenValidator {
                 t.setValue(values);
             } else if (oValue instanceof List<?>) {
                 //more than one child element AttributeValue
+                @SuppressWarnings("unchecked")
                 List<String> values = (List<String>)oValue;
                 values.addAll(valueList);
                 t.setValue(values);

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/e344688f/plugins/core/src/main/java/org/apache/cxf/fediz/core/servlet/FederationFilter.java
----------------------------------------------------------------------
diff --git a/plugins/core/src/main/java/org/apache/cxf/fediz/core/servlet/FederationFilter.java
b/plugins/core/src/main/java/org/apache/cxf/fediz/core/servlet/FederationFilter.java
index af75327..728cc23 100644
--- a/plugins/core/src/main/java/org/apache/cxf/fediz/core/servlet/FederationFilter.java
+++ b/plugins/core/src/main/java/org/apache/cxf/fediz/core/servlet/FederationFilter.java
@@ -31,8 +31,7 @@ import javax.servlet.ServletResponse;
 import javax.servlet.http.HttpServletRequest;
 
 import org.w3c.dom.Element;
-
-import org.apache.cxf.fediz.core.FederationPrincipal;
+import org.apache.cxf.fediz.core.FedizPrincipal;
 import org.apache.cxf.fediz.core.SecurityTokenThreadLocal;
 
 
@@ -53,7 +52,7 @@ public class FederationFilter implements Filter {
         if (request instanceof HttpServletRequest) {
             HttpServletRequest hrequest = (HttpServletRequest)request;
             Principal p = hrequest.getUserPrincipal();
-            FederationPrincipal fedPrinc = (FederationPrincipal)p;
+            FedizPrincipal fedPrinc = (FedizPrincipal)p;
             Element el = (Element)fedPrinc.getLoginToken();
             if (el != null) {
                 try {


Mime
View raw message