Closes #1057. valMaxLen accepts null entries

lift · Jul 6, 2011 · 7cc7134 · 7cc7134
1 parent c973f08
commit 7cc7134
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/core/util/src/main/scala/net/liftweb/util/BaseField.scala b/core/util/src/main/scala/net/liftweb/util/BaseField.scala
@@ -189,7 +189,7 @@ trait StringValidators {
    */
   def valMaxLen(len: Int, msg: => String)(value: ValueType): List[FieldError] =
     valueTypeToBoxString(value) match {
-      case Full(str) if (null ne str) && str.length <= len => Nil
+      case Full(str) if (null eq str) || str.length <= len => Nil
       case _ =>  List(FieldError(this, Text(msg)))
     }
 

diff --git a/web/webkit/src/main/scala/net/liftweb/http/LiftScreen.scala b/web/webkit/src/main/scala/net/liftweb/http/LiftScreen.scala
@@ -564,7 +564,7 @@ trait AbstractScreen extends Factory {
    */
   protected def valMaxLen(len: => Int, msg: => String): String => List[FieldError] =
     s => s match {
-      case str if (null ne str) && str.length <= len => Nil
+      case str if (null eq str) || str.length <= len => Nil
       case _ => List(FieldError(currentField.box openOr new FieldIdentifier {}, Text(msg)))
     }