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

[noreply at shibboleth.net]

Author: scantor
Date: Sat Jan 24 15:24:37 2015
New Revision: 7280

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7280&view=rev
Log:
IDP-578 - Missed test check-in

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=7280&r1=7279&r2=7280&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 Sat Jan 24 15:24:37 2015
@@ -240,7 +240,6 @@
                 log.error("{} Error resolving attributes: Invalid Attribute resolver configuration", getLogPrefix());
                 if (!maskFailures) {
                     ActionSupport.buildEvent(profileRequestContext, IdPEventIds.UNABLE_RESOLVE_ATTRIBS);
-                    return;
                 }
             } else {
                 final AttributeResolver attributeResolver = component.getComponent();

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=7280&r1=7279&r2=7280&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 Sat Jan 24 15:24:37 2015
@@ -173,7 +173,10 @@
         action.initialize();
 
         final Event event = action.execute(src);
-        ActionTestingSupport.assertEvent(event, IdPEventIds.UNABLE_RESOLVE_ATTRIBS);
+        ActionTestingSupport.assertProceedEvent(event);
+        final AttributeContext resolvedAttributeCtx =
+                prc.getSubcontext(RelyingPartyContext.class).getSubcontext(AttributeContext.class);
+        Assert.assertNull(resolvedAttributeCtx);
     }
     
     /** Test that action returns the proper event if the attribute configuration is broken */
@@ -187,6 +190,7 @@
         definitions.add(new MockAttributeDefinition("ad1", new ResolutionException()));
 
         final ResolveAttributes action = new ResolveAttributes(new AttributeService(null));
+        action.setMaskFailures(false);
         action.initialize();
 
         final Event event = action.execute(src);