Author: ddam
Date: Tue Feb 24 11:18:47 2009
New Revision: 747342
URL: http://svn.apache.org/viewvc?rev=747342&view=rev
Log:
- use filter.encode() instead of filter.toString()
- implement toString for SimpleFilter, just in case
Modified:
portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/mapping/ldap/dao/impl/SpringLDAPEntityDAO.java
portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/mapping/ldap/filter/SimpleFilter.java
Modified:
portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/mapping/ldap/dao/impl/SpringLDAPEntityDAO.java
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/mapping/ldap/dao/impl/SpringLDAPEntityDAO.java?rev=747342&r1=747341&r2=747342&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/mapping/ldap/dao/impl/SpringLDAPEntityDAO.java
(original)
+++
portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/mapping/ldap/dao/impl/SpringLDAPEntityDAO.java
Tue Feb 24 11:18:47 2009
@@ -185,7 +185,7 @@
filter =
SearchUtil.andFilters(configuration.getSearchFilter(), filter);
}
}
- String filterStr = filter.toString();
+ String filterStr = filter.encode();
if (StringUtils.isEmpty(filterStr))
{
filterStr = "(objectClass=*)"; // trivial search query
Modified:
portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/mapping/ldap/filter/SimpleFilter.java
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/mapping/ldap/filter/SimpleFilter.java?rev=747342&r1=747341&r2=747342&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/mapping/ldap/filter/SimpleFilter.java
(original)
+++
portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/mapping/ldap/filter/SimpleFilter.java
Tue Feb 24 11:18:47 2009
@@ -44,4 +44,8 @@
return sb.append(ldapFilter);
}
+ public String toString() {
+ return ldapFilter;
+ }
+
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
