From f1a2affae1e078beec54788fc4130c197ac8d823 Mon Sep 17 00:00:00 2001
From: Lukasz Lenart <lukaszlenart@apache.org>
Date: Mon, 18 Mar 2013 20:17:24 +0000
Subject: [PATCH] WW-4012 Changes order of params evaluation that the
 expression takes precedence

git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1457969 13f79535-47bb-0310-9956-ffa450edef68
---
 .../validators/StringLengthFieldValidator.java       | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/validator/validators/StringLengthFieldValidator.java b/xwork-core/src/main/java/com/opensymphony/xwork2/validator/validators/StringLengthFieldValidator.java
index 2e673785f..5587248d2 100644
--- a/xwork-core/src/main/java/com/opensymphony/xwork2/validator/validators/StringLengthFieldValidator.java
+++ b/xwork-core/src/main/java/com/opensymphony/xwork2/validator/validators/StringLengthFieldValidator.java
@@ -104,12 +104,10 @@ public class StringLengthFieldValidator extends FieldValidatorSupport {
     }
 
     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 extends FieldValidatorSupport {
     }
 
     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) {