[java-identity-provider COMMIT] in /trunk/idp-profile-impl/src: main/java/net/shibboleth/idp/profile/impl/ResolveAttr...

[noreply at shibboleth.net]

Author: rdw
Date: Mon Mar  4 12:50:31 2013
New Revision: 4299

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4299&view=rev
Log:
IDP-203 missed checkin : AttributeResolutionException => ResolutionException

Modified:
    trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/ResolveAttributes.java
    trunk/idp-profile-impl/src/test/java/net/shibboleth/idp/profile/impl/ResolveAttributesTest.java

Modified: trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/ResolveAttributes.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/ResolveAttributes.java?rev=4299&r1=4298&r2=4299&view=diff
==============================================================================
--- trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/ResolveAttributes.java (original)
+++ trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/ResolveAttributes.java Mon Mar  4 12:50:31 2013
@@ -26,7 +26,7 @@
 import net.shibboleth.ext.spring.webflow.Events;
 import net.shibboleth.idp.attribute.AttributeContext;
 import net.shibboleth.idp.attribute.resolver.AttributeResolutionContext;
-import net.shibboleth.idp.attribute.resolver.AttributeResolutionException;
+import net.shibboleth.idp.attribute.resolver.ResolutionException;
 import net.shibboleth.idp.attribute.resolver.AttributeResolver;
 import net.shibboleth.idp.profile.AbstractProfileAction;
 import net.shibboleth.idp.profile.ActionSupport;
@@ -137,7 +137,7 @@
             attributeCtx.setAttributes(resolutionContext.getResolvedAttributes().values());
 
             relyingPartyCtx.addSubcontext(attributeCtx);
-        } catch (AttributeResolutionException e) {
+        } catch (ResolutionException e) {
             log.error("Action {}: Error resolving attributes", getId(), e);
             return ActionSupport.buildEvent(this, UNABLE_RESOLVE_ATTRIBS);
         }

Modified: trunk/idp-profile-impl/src/test/java/net/shibboleth/idp/profile/impl/ResolveAttributesTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-impl/src/test/java/net/shibboleth/idp/profile/impl/ResolveAttributesTest.java?rev=4299&r1=4298&r2=4299&view=diff
==============================================================================
--- trunk/idp-profile-impl/src/test/java/net/shibboleth/idp/profile/impl/ResolveAttributesTest.java (original)
+++ trunk/idp-profile-impl/src/test/java/net/shibboleth/idp/profile/impl/ResolveAttributesTest.java Mon Mar  4 12:50:31 2013
@@ -24,7 +24,7 @@
 import net.shibboleth.idp.attribute.AttributeContext;
 import net.shibboleth.idp.attribute.StringAttributeValue;
 import net.shibboleth.idp.attribute.resolver.AttributeResolutionContext;
-import net.shibboleth.idp.attribute.resolver.AttributeResolutionException;
+import net.shibboleth.idp.attribute.resolver.ResolutionException;
 import net.shibboleth.idp.attribute.resolver.AttributeResolver;
 import net.shibboleth.idp.attribute.resolver.BaseAttributeDefinition;
 import net.shibboleth.idp.attribute.resolver.MockAttributeDefinition;
@@ -167,7 +167,7 @@
         attribute.getValues().add(new StringAttributeValue("value1"));
 
         LazySet<BaseAttributeDefinition> definitions = new LazySet<BaseAttributeDefinition>();
-        definitions.add(new MockAttributeDefinition("ad1", new AttributeResolutionException()));
+        definitions.add(new MockAttributeDefinition("ad1", new ResolutionException()));
 
         AttributeResolver resolver = new AttributeResolver("resolver", definitions, null);
         resolver.initialize();