[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: Wed Mar 28 14:34:11 2012
New Revision: 4141

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4141&view=rev
Log:
Fix a couple of bugs in the corners of error handling and component handling.

Modified:
    trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AttributeResolver.java
    trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/BaseAttributeDefinition.java
    trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/BaseResolverPlugin.java
    trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/ResolvedAttributeDefinition.java
    trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/ResolvedDataConnector.java

Modified: trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AttributeResolver.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AttributeResolver.java?rev=4141&r1=4140&r2=4141&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AttributeResolver.java (original)
+++ trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AttributeResolver.java Wed Mar 28 14:34:11 2012
@@ -272,7 +272,7 @@
             log.debug("Attribute Resolver {}: resolving attribute definition {}", getId(), attributeId);
             resolvedAttribute = definition.resolve(resolutionContext);
         } catch (AttributeResolutionException e) {
-            if (definition.isPropagateResolutionExceptions()) {
+            if (!definition.isPropagateResolutionExceptions()) {
                 log.debug("Attribute Resolver {}: attribute definition {} produced the following"
                         + " error but was configured not to propogate it.", new Object[] {getId(), attributeId, e,});
             } else {

Modified: trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/BaseAttributeDefinition.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/BaseAttributeDefinition.java?rev=4141&r1=4140&r2=4141&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/BaseAttributeDefinition.java (original)
+++ trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/BaseAttributeDefinition.java Wed Mar 28 14:34:11 2012
@@ -191,7 +191,7 @@
         displayDescriptions = Collections.emptyMap();
         displayNames = Collections.emptyMap();
 
-        super.destroy();
+        super.doDestroy();
     }
 
     /** {@inheritDoc} */
@@ -207,7 +207,7 @@
 
     /** {@inheritDoc} */
     protected void doValidate() throws ComponentValidationException {
-        super.validate();
+        super.doValidate();
 
         for (AttributeEncoder encoder : encoders) {
             if (encoder instanceof ValidatableComponent) {

Modified: trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/BaseResolverPlugin.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/BaseResolverPlugin.java?rev=4141&r1=4140&r2=4141&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/BaseResolverPlugin.java (original)
+++ trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/BaseResolverPlugin.java Wed Mar 28 14:34:11 2012
@@ -34,7 +34,6 @@
 import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
 import net.shibboleth.utilities.java.support.component.ComponentSupport;
 import net.shibboleth.utilities.java.support.component.ComponentValidationException;
-import net.shibboleth.utilities.java.support.component.DestructableComponent;
 import net.shibboleth.utilities.java.support.component.UnmodifiableComponent;
 import net.shibboleth.utilities.java.support.component.ValidatableComponent;
 import net.shibboleth.utilities.java.support.logic.Assert;
@@ -54,7 +53,7 @@
  */
 @ThreadSafe
 public abstract class BaseResolverPlugin<ResolvedType> extends AbstractDestructableIdentifiableInitializableComponent
-        implements ValidatableComponent, UnmodifiableComponent, DestructableComponent {
+        implements ValidatableComponent, UnmodifiableComponent {
 
     /** Class logger. */
     private final Logger log = LoggerFactory.getLogger(BaseResolverPlugin.class);
@@ -170,7 +169,7 @@
 
         if (!activationCriteria.apply(resolutionContext)) {
             log.debug("Resolver plugin '{}': activation criteria not met, nothing to do", getId());

[... 56 lines stripped ...]