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

[noreply at shibboleth.net]

Author: rdw
Date: Sat Dec 28 11:05:42 2013
New Revision: 5100

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5100&view=rev
Log:
Missing parameters to logging

Modified:
    trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/impl/policyrule/saml/AttributeInMetadataPolicyRule.java

Modified: trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/impl/policyrule/saml/AttributeInMetadataPolicyRule.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/impl/policyrule/saml/AttributeInMetadataPolicyRule.java?rev=5100&r1=5099&r2=5100&view=diff
==============================================================================
--- trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/impl/policyrule/saml/AttributeInMetadataPolicyRule.java (original)
+++ trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/impl/policyrule/saml/AttributeInMetadataPolicyRule.java Sat Dec 28 11:05:42 2013
@@ -94,11 +94,13 @@
     }
 
     /** {@inheritDoc} */
-    public void setId(@Nullable String id) {
+    @Override
+    public void setId(@Nullable final String id) {
         super.setId(id);
     }
 
     /** {@inheritDoc} */
+    @Override
     @Nonnull public Set<IdPAttributeValue<?>> getMatchingValues(@Nonnull final IdPAttribute attribute,
             @Nonnull final AttributeFilterContext filterContext) {
 
@@ -126,11 +128,11 @@
 
         final Set<IdPAttributeValue<?>> values = new HashSet<>();
 
-        for (IdPRequestedAttribute requestedAttribute : requestedAttributeList) {
+        for (final IdPRequestedAttribute requestedAttribute : requestedAttributeList) {
 
             if (null == requestedAttribute) {
                 log.info("{} Attribute {} found in metadata but with no values that"
-                        + " could be decoded, values not matched");
+                        + " could be decoded, values not matched", getLogPrefix(), attribute.getId());
                 continue;
             }
 
@@ -162,7 +164,7 @@
 
         final Set<IdPAttributeValue<?>> result = new HashSet<>(attribute.getValues().size());
 
-        for (IdPAttributeValue attributeValue : attribute.getValues()) {
+        for (final IdPAttributeValue attributeValue : attribute.getValues()) {
             if (requestedValues.contains(attributeValue)) {
                 result.add(attributeValue);
             }
@@ -180,7 +182,7 @@
         // local cache of cached entry to allow unsynchronised clearing.
         String prefix = logPrefix;
         if (null == prefix) {
-            StringBuilder builder = new StringBuilder("Attribute Filter '").append(getId()).append("':");
+            final StringBuilder builder = new StringBuilder("Attribute Filter '").append(getId()).append("':");
             prefix = builder.toString();
             if (null == logPrefix) {
                 logPrefix = prefix;