[java-identity-provider COMMIT] in /trunk/idp-attribute-resolver-spring/src: main/java/net/shibboleth/idp/attribute/r...

[noreply at shibboleth.net]

Author: rdw
Date: Sun Jan 19 11:39:48 2014
New Revision: 5218

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5218&view=rev
Log:
IDP-354 Fix regressions.

Modified:
    trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/RegexSplitAttributeDefinitionParser.java
    trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/ScriptedAttributeParserTest.java

Modified: trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/RegexSplitAttributeDefinitionParser.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/RegexSplitAttributeDefinitionParser.java?rev=5218&r1=5217&r2=5218&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/RegexSplitAttributeDefinitionParser.java (original)
+++ trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/RegexSplitAttributeDefinitionParser.java Sun Jan 19 11:39:48 2014
@@ -72,6 +72,7 @@
 
         if (caseSensitive) {
             pattern.addConstructorArgValue(regexp);
+            pattern.addConstructorArgValue(0);
         } else {
             pattern.addConstructorArgValue(regexp);
             pattern.addConstructorArgValue(Pattern.CASE_INSENSITIVE);

Modified: trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/ScriptedAttributeParserTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/ScriptedAttributeParserTest.java?rev=5218&r1=5217&r2=5218&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/ScriptedAttributeParserTest.java (original)
+++ trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/ScriptedAttributeParserTest.java Sun Jan 19 11:39:48 2014
@@ -19,9 +19,9 @@
 
 import net.shibboleth.idp.attribute.resolver.impl.ad.ScriptedAttributeDefinition;
 import net.shibboleth.idp.attribute.resolver.spring.BaseAttributeDefinitionParserTest;
-import net.shibboleth.idp.attribute.resolver.spring.ad.ScriptedAttributeDefinitionParser;
 import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
+import org.springframework.beans.factory.BeanCreationException;
 import org.springframework.beans.factory.BeanDefinitionStoreException;
 import org.testng.Assert;
 import org.testng.annotations.Test;
@@ -59,7 +59,7 @@
         try {
             getAttributeDefn("scriptedAttributeBad.xml", ScriptedAttributeDefinition.class);     
             Assert.fail("Bad script worked?");
-        } catch (BeanDefinitionStoreException e) {
+        } catch (BeanDefinitionStoreException | BeanCreationException e) {
             // OK
         }
     }