Author: lukaszlenart
Date: Mon Mar 18 20:17:24 2013
New Revision: 1457969
URL: http://svn.apache.org/r1457969
Log:
WW-4012 Changes order of params evaluation that the expression takes precedence
Modified:
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/validator/validators/StringLengthFieldValidator.java
Modified:
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/validator/validators/StringLengthFieldValidator.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/validator/validators/StringLengthFieldValidator.java?rev=1457969&r1=1457968&r2=1457969&view=diff
==============================================================================
---
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/validator/validators/StringLengthFieldValidator.java
(original)
+++
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/validator/validators/StringLengthFieldValidator.java
Mon Mar 18 20:17:24 2013
@@ -104,12 +104,10 @@ public class StringLengthFieldValidator
}
public int getMaxLength() {
- if (maxLength > -1) {
- return maxLength;
- } else if (StringUtils.isNotEmpty(maxLengthExpression)) {
+ if (StringUtils.isNotEmpty(maxLengthExpression)) {
return (Integer) parse(maxLengthExpression, Integer.class);
}
- return -1;
+ return maxLength;
}
public void setMinLength(int minLength) {
@@ -121,12 +119,10 @@ public class StringLengthFieldValidator
}
public int getMinLength() {
- if (minLength > -1) {
- return minLength;
- } else if (StringUtils.isNotEmpty(minLengthExpression)) {
+ if (StringUtils.isNotEmpty(minLengthExpression)) {
return (Integer) parse(minLengthExpression, Integer.class);
}
- return -1;
+ return minLength;
}
public void setTrim(boolean trim) {
