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

[noreply at shibboleth.net]

Author: rdw
Date: Tue Aug  6 09:22:36 2013
New Revision: 4665

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4665&view=rev
Log:
IDP-297 Throw out an Error log message if we detect the same attribute being declared twice.  Modify test to exercise same

Modified:
    trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AttributeResolver.java
    trunk/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/AttributeResolverTest.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=4665&r1=4664&r2=4665&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 Tue Aug  6 09:22:36 2013
@@ -87,6 +87,9 @@
         if (definitions != null) {
             for (BaseAttributeDefinition definition : definitions) {
                 if (definition != null) {
+                    if (checkedDefinitions.containsKey(definition.getId())) {
+                        log.error("{} duplicate Attribute Definition with id {}", logPrefix, definition.getId());
+                    }
                     checkedDefinitions.put(definition.getId(), definition);
                 }
             }
@@ -97,6 +100,9 @@
         if (connectors != null) {
             for (BaseDataConnector connector : connectors) {
                 if (connector != null) {
+                    if (checkedConnectors.containsKey(connector.getId())) {
+                        log.error("{} duplicate Data Connector Definition with id {}", logPrefix, connector.getId());
+                    }
                     checkedConnectors.put(connector.getId(), connector);
                 }
             }

Modified: trunk/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/AttributeResolverTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/AttributeResolverTest.java?rev=4665&r1=4664&r2=4665&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/AttributeResolverTest.java (original)
+++ trunk/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/AttributeResolverTest.java Tue Aug  6 09:22:36 2013
@@ -17,6 +17,7 @@
 
 package net.shibboleth.idp.attribute.resolver;
 
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
@@ -117,7 +118,7 @@
 
     /** Test getting, setting, overwriting, defensive collection copy. */
     @Test public void setAttributeDefinitions() throws Exception {
-        LazySet<BaseAttributeDefinition> definitions = new LazySet<BaseAttributeDefinition>();
+        ArrayList<BaseAttributeDefinition> definitions = new ArrayList<BaseAttributeDefinition>();
         definitions.add(new MockAttributeDefinition("foo", new Attribute("test")));
         definitions.add(null);
         definitions.add(new MockAttributeDefinition("bar", new Attribute("test")));