[java-identity-provider COMMIT] in /trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resol...

[noreply at shibboleth.net]

Author: rdw
Date: Tue Dec 10 06:23:37 2013
New Revision: 5016

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5016&view=rev
Log:
IDP-330 Tidy up.   Remove grocer's apostrophe in log message.  Make the Base resolver implement DestructableBean so that spring tears these elements down.

Modified:
    trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AbstractResolverPlugin.java
    trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AttributeResolverImpl.java

Modified: trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AbstractResolverPlugin.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AbstractResolverPlugin.java?rev=5016&r1=5015&r2=5016&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AbstractResolverPlugin.java (original)
+++ trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AbstractResolverPlugin.java Tue Dec 10 06:23:37 2013
@@ -37,6 +37,7 @@
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.DisposableBean;
 
 import com.google.common.base.Objects;
 import com.google.common.base.Predicate;
@@ -50,7 +51,7 @@
  */
 @ThreadSafe
 public abstract class AbstractResolverPlugin<ResolvedType> extends
-        AbstractDestructableIdentifiableInitializableComponent implements ResolverPlugin<ResolvedType> {
+        AbstractDestructableIdentifiableInitializableComponent implements ResolverPlugin<ResolvedType>, DisposableBean {
 
     /** Class logger. */
     private final Logger log = LoggerFactory.getLogger(AbstractResolverPlugin.class);

Modified: trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AttributeResolverImpl.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AttributeResolverImpl.java?rev=5016&r1=5015&r2=5016&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AttributeResolverImpl.java (original)
+++ trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AttributeResolverImpl.java Tue Dec 10 06:23:37 2013
@@ -412,20 +412,20 @@
 
             // remove nulls
             if (null == resolvedAttribute) {
-                log.debug("{} removing result of attribute definition {}, it's null", logPrefix, definition.getId());
+                log.debug("{} removing result of attribute definition {}, its null", logPrefix, definition.getId());
                 continue;
             }
 
             // remove dependency-only attributes
             if (definition.isDependencyOnly()) {
-                log.debug("{} removing result of attribute definition {}, it's marked as depdency only", logPrefix,
+                log.debug("{} removing result of attribute definition {}, its marked as depdency only", logPrefix,
                         definition.getId());
                 continue;
             }
 
             // remove value-less attributes
             if (resolvedAttribute.getValues().size() == 0) {
-                log.debug("{} removing result of attribute definition {}, it's attribute contains no values",
+                log.debug("{} removing result of attribute definition {}, its attribute contains no values",
                         logPrefix, definition.getId());
                 continue;
             }