Author: sebb
Date: Mon Apr 18 22:40:24 2011
New Revision: 1094799
URL: http://svn.apache.org/viewvc?rev=1094799&view=rev
Log:
VALIDATOR-294 NPE in CodeValidator.validate(null) if RE is null but min or max
are not -1
Modified:
commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/CodeValidator.java
commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/routines/CodeValidatorTest.java
Modified:
commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/CodeValidator.java
URL:
http://svn.apache.org/viewvc/commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/CodeValidator.java?rev=1094799&r1=1094798&r2=1094799&view=diff
==============================================================================
---
commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/CodeValidator.java
(original)
+++
commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/CodeValidator.java
Mon Apr 18 22:40:24 2011
@@ -213,8 +213,12 @@ public final class CodeValidator impleme
*/
public Object validate(String input) {
- String code = (input == null ? null : input.trim());
- if (code != null && code.length() == 0) {
+ if (input == null) {
+ return null;
+ }
+
+ String code = input.trim();
+ if (code.length() == 0) {
return null;
}
Modified:
commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/routines/CodeValidatorTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/routines/CodeValidatorTest.java?rev=1094799&r1=1094798&r2=1094799&view=diff
==============================================================================
---
commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/routines/CodeValidatorTest.java
(original)
+++
commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/routines/CodeValidatorTest.java
Mon Apr 18 22:40:24 2011
@@ -195,6 +195,18 @@ public class CodeValidatorTest extends T
assertEquals("Trimmed", "A", validator.validate(" A "));
}
+ public void testValidator294_1() {
+ CodeValidator validator = new CodeValidator((String)null, 0, -1,
(CheckDigit)null);
+ assertEquals("Null", null, validator.validate(null));
+ validator = new CodeValidator((String)null, -1, 0, (CheckDigit)null);
+ assertEquals("Null", null, validator.validate(null));
+ }
+
+ public void testValidator294_2() {
+ CodeValidator validator = new CodeValidator((String)null, -1, 0,
(CheckDigit)null);
+ assertEquals("Null", null, validator.validate(null));
+ }
+
/**
* Test Regular Expression.
*/
