[java-identity-provider COMMIT] /trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolve...

[noreply at shibboleth.net]

Author: rdw
Date: Tue Sep 27 10:59:29 2016
New Revision: 8433

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=8433&view=rev
Log:
Add annotation to constructor and object annotation in method

Modified:
    trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/ad/impl/IdPAttributePrincipalValuesFunction.java

Modified: trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/ad/impl/IdPAttributePrincipalValuesFunction.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/ad/impl/IdPAttributePrincipalValuesFunction.java?rev=8433&r1=8432&r2=8433&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/ad/impl/IdPAttributePrincipalValuesFunction.java	(original)
+++ trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/ad/impl/IdPAttributePrincipalValuesFunction.java	Tue Sep 27 10:59:29 2016
@@ -41,20 +41,20 @@
      *
      * @param attrName the name to filter on.
      */
-    public IdPAttributePrincipalValuesFunction(final String attrName) {
+    public IdPAttributePrincipalValuesFunction(@Nonnull final String attrName) {
         attributeName = Constraint.isNotNull(attrName, "Attribute Name should be non-null");
     }
 
     /** {@inheritDoc} */
-    @Override
-    @Nullable public List<IdPAttributeValue<?>> apply(@Nullable final Principal principal) {
-        if (principal  instanceof IdPAttributePrincipal) {
+    @Override @Nullable public List<IdPAttributeValue<?>> apply(@Nullable final Principal principal) {
+        
+        if (null != principal && principal  instanceof IdPAttributePrincipal) {
             final IdPAttributePrincipal attributePrincipal = (IdPAttributePrincipal) principal;
             final IdPAttribute attribute = attributePrincipal.getAttribute(); 
             if (null != attribute && attributeName.equals(attribute.getId())) {
                 return attribute.getValues();
             }
         }
-    return null;
+        return null;
     }
 }