[utilities COMMIT] in /spring-extensions/trunk: pom.xml src/main/java/net/shibboleth/ext/spring/util/SpringSupport.java

[noreply at shibboleth.net]

Author: putmanb
Date: Thu Feb 12 17:52:30 2015
New Revision: 752

URL: http://svn.shibboleth.net/view/utilities?rev=752&view=rev
Log:
Add a single Element variant of parseCustomElements.

Modified:
    spring-extensions/trunk/pom.xml
    spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/util/SpringSupport.java

Modified: spring-extensions/trunk/pom.xml
URL: http://svn.shibboleth.net/view/utilities/spring-extensions/trunk/pom.xml?rev=752&r1=751&r2=752&view=diff
==============================================================================
--- spring-extensions/trunk/pom.xml (original)
+++ spring-extensions/trunk/pom.xml Thu Feb 12 17:52:30 2015
@@ -12,7 +12,7 @@
 
     <groupId>net.shibboleth.ext</groupId>
     <artifactId>spring-extensions</artifactId>
-    <version>5.0-SNAPSHOT</version>
+    <version>5.1-SNAPSHOT</version>
 
     <name>Spring Framework Extension</name>
     <description>

Modified: spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/util/SpringSupport.java
URL: http://svn.shibboleth.net/view/utilities/spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/util/SpringSupport.java?rev=752&r1=751&r2=752&view=diff
==============================================================================
--- spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/util/SpringSupport.java (original)
+++ spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/util/SpringSupport.java Thu Feb 12 17:52:30 2015
@@ -150,11 +150,29 @@
 
         ManagedList<BeanDefinition> definitions = new ManagedList<>(elements.size());
         for (Element e : elements) {
-            // TODO null check e
-            definitions.add(parserContext.getDelegate().parseCustomElement(e));
+            if (e != null) {
+                definitions.add(parseCustomElement(e, parserContext));
+            }
         }
 
         return definitions;
+    }
+    
+    /**
+     * Parse an element into a bean definition.
+     * 
+     * @param element the element to parse
+     * @param parserContext current parsing context
+     * 
+     * @return the parsed bean definition
+     */
+    @Nullable public static BeanDefinition parseCustomElement(@Nullable final Element element, 
+            @Nonnull final ParserContext parserContext) {
+        if (element == null) {
+            return null;
+        }
+
+        return parserContext.getDelegate().parseCustomElement(element);
     }
 
     /**