[java-shib-common COMMIT] in /branches/REL_1: doc/RELEASE-NOTES.txt src/main/java/edu/internet2/middleware/shibboleth...

[noreply at shibboleth.net]

Author: scantor
Date: Tue Aug  5 13:36:27 2014
New Revision: 1098

URL: http://svn.shibboleth.net/view/java-shib-common?rev=1098&view=rev
Log:
SC-193 - Empty static data connector in attribute-resolver.xml results in null exception

Modified:
    branches/REL_1/doc/RELEASE-NOTES.txt
    branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/dataConnector/StaticDataConnector.java
    branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/dataConnector/StaticDataConnectorBeanDefinitionParser.java

Modified: branches/REL_1/doc/RELEASE-NOTES.txt
URL: http://svn.shibboleth.net/view/java-shib-common/branches/REL_1/doc/RELEASE-NOTES.txt?rev=1098&r1=1097&r2=1098&view=diff
==============================================================================
--- branches/REL_1/doc/RELEASE-NOTES.txt (original)
+++ branches/REL_1/doc/RELEASE-NOTES.txt Tue Aug  5 13:36:27 2014
@@ -2,7 +2,8 @@
 =============================================
 [SC-190] - Proxy password not handled correctly for SVNResource
 [SC-191] - Credential config parsing of PublicKeys is broken in AbstractBasicCredentialBeanDefinitionParser
-[SC-192] - LDAP attribute value backslash escaping 
+[SC-192] - LDAP attribute value backslash escaping
+[SC-193] - Empty static data connector in attribute-resolver.xml results in null exception
 Also, updating POM to implement:
 [JXT-106] - Update Apache Santuario (xmlsec) to 1.5.6
 

Modified: branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/dataConnector/StaticDataConnector.java
URL: http://svn.shibboleth.net/view/java-shib-common/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/dataConnector/StaticDataConnector.java?rev=1098&r1=1097&r2=1098&view=diff
==============================================================================
--- branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/dataConnector/StaticDataConnector.java (original)
+++ branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/dataConnector/StaticDataConnector.java Tue Aug  5 13:36:27 2014
@@ -37,7 +37,8 @@
      * @param staticAttributes attributes this data connector will return
      */
     public StaticDataConnector(List<BaseAttribute<String>> staticAttributes) {
-        attributes = new HashMap<String, BaseAttribute>(staticAttributes.size());
+        attributes = new HashMap<String, BaseAttribute>();
+        
         if (staticAttributes != null) {            
             for (BaseAttribute<String> attribute : staticAttributes) {
                 attributes.put(attribute.getId(), attribute);

Modified: branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/dataConnector/StaticDataConnectorBeanDefinitionParser.java
URL: http://svn.shibboleth.net/view/java-shib-common/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/dataConnector/StaticDataConnectorBeanDefinitionParser.java?rev=1098&r1=1097&r2=1098&view=diff
==============================================================================
--- branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/dataConnector/StaticDataConnectorBeanDefinitionParser.java (original)
+++ branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/dataConnector/StaticDataConnectorBeanDefinitionParser.java Tue Aug  5 13:36:27 2014
@@ -18,6 +18,7 @@
 package edu.internet2.middleware.shibboleth.common.config.attribute.resolver.dataConnector;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
@@ -68,7 +69,7 @@
      */
     protected List<BaseAttribute<String>> processAttributes(List<Element> attributeElems) {
         if (attributeElems == null || attributeElems.size() == 0) {
-            return null;
+            return Collections.emptyList();
         }
 
         List<BaseAttribute<String>> attributes = new ArrayList<BaseAttribute<String>>();