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

[noreply at shibboleth.net]

Author: scantor
Date: Tue Oct 21 12:11:22 2014
New Revision: 6759

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6759&view=rev
Log:
Guard property.

Modified:
    trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/RDBMSDataConnectorParser.java

Modified: trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/RDBMSDataConnectorParser.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/RDBMSDataConnectorParser.java?rev=6759&r1=6758&r2=6759&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/RDBMSDataConnectorParser.java (original)
+++ trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/RDBMSDataConnectorParser.java Tue Oct 21 12:11:22 2014
@@ -114,7 +114,10 @@
 
         builder.addPropertyValue("executableSearchBuilder", v2Parser.createTemplateBuilder());
 
-        builder.addPropertyValue("mappingStrategy", v2Parser.createMappingStrategy());
+        final BeanDefinition def = v2Parser.createMappingStrategy();
+        if (def != null) {
+            builder.addPropertyValue("mappingStrategy", def);
+        }
         
         builder.addPropertyValue("resultsCache", v2Parser.createCache());