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

[noreply at shibboleth.net]

Author: dfisher
Date: Thu Aug 20 22:47:38 2015
New Revision: 7697

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7697&view=rev
Log:
IDP-795 trim search filter

Trim result from velocity template that is used as a search filter.

Modified:
    trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/ldap/impl/TemplatedExecutableSearchFilterBuilder.java

Modified: trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/ldap/impl/TemplatedExecutableSearchFilterBuilder.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/ldap/impl/TemplatedExecutableSearchFilterBuilder.java?rev=7697&r1=7696&r2=7697&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/ldap/impl/TemplatedExecutableSearchFilterBuilder.java	(original)
+++ trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/ldap/impl/TemplatedExecutableSearchFilterBuilder.java	Thu Aug 20 22:47:38 2015
@@ -199,7 +199,10 @@
      * @return result of the merge operation
      */
     protected String merge(@Nonnull final VelocityContext context) {
-        final String result = template.merge(context);
+        String result = template.merge(context);
+        if (result != null) {
+            result = result.trim();
+        }
         log.debug("Template text {} yields {}", templateText, result);
         return result;
     }