[richfaces-svn-commits] JBoss Rich Faces SVN: r9940 - trunk/framework/impl/src/main/java/org/richfaces/model/impl/expressive.
Author: konstantin.mishin
Date: 2008-08-06 07:52:16 -0400 (Wed, 06 Aug 2008)
New Revision: 9940
Modified:
trunk/framework/impl/src/main/java/org/richfaces/model/impl/expressive/WrappedBeanFilter.java
Log:
RF-4073
Modified:
trunk/framework/impl/src/main/java/org/richfaces/model/impl/expressive/WrappedBeanFilter.java
===================================================================
---
trunk/framework/impl/src/main/java/org/richfaces/model/impl/expressive/WrappedBeanFilter.java 2008-08-06
11:44:55 UTC (rev 9939)
+++
trunk/framework/impl/src/main/java/org/richfaces/model/impl/expressive/WrappedBeanFilter.java 2008-08-06
11:52:16 UTC (rev 9940)
@@ -25,11 +25,13 @@
if (filterField instanceof ExtendedFilterField) {
Object property =
wrapper.getProperty(filterField.getExpression().getExpressionString());
String filterValue = ((ExtendedFilterField)filterField).getFilterValue();
- if(filterValue != null && filterValue.length() > 0) {
+ if(filterValue != null) {
filterValue = filterValue.trim().toUpperCase();
- if(property == null ||
!property.toString().trim().toUpperCase().startsWith(filterValue)) {
- return false;
- }
+ if(filterValue.length() > 0) {
+ if(property == null ||
!property.toString().trim().toUpperCase().startsWith(filterValue)) {
+ return false;
+ }
+ }
}
} else {
Object property =
wrapper.getProperty(filterField.getExpression().getExpressionString());