Merged: Test case and fix for #3524

svn changeset:9180/svn branch:6.2

diff --git a/src/com/vaadin/data/validator/RegexpValidator.java b/src/com/vaadin/data/validator/RegexpValidator.java
index 2a3979dcdbdb0b71565ad6825fdadc7cdbeaf3bd..96679418c8964b6f3d33538d4b393a2fe6d3b533 100644 (file)
--- a/src/com/vaadin/data/validator/RegexpValidator.java
+++ b/src/com/vaadin/data/validator/RegexpValidator.java
@@ -12,8 +12,8 @@ import java.util.regex.Pattern;
  * {@link java.util.regex.Pattern#sum}\r
  * </p>\r
  * <p>\r
- * See {@link com.vaadin.data.validator.AbstractStringValidator} for\r
- * more information.\r
+ * See {@link com.vaadin.data.validator.AbstractStringValidator} for more\r
+ * information.\r
  * </p>\r
  * \r
  * @author IT Mill Ltd.\r
@@ -26,7 +26,7 @@ public class RegexpValidator extends AbstractStringValidator {
 \r
     private Pattern pattern;\r
     private boolean complete;\r
-    private Matcher matcher = null;\r
+    private transient Matcher matcher = null;\r
 \r
     /**\r
      * Creates a validator for checking that the regular expression matches the\r

diff --git a/src/com/vaadin/tests/TestSerialization.java b/src/com/vaadin/tests/TestSerialization.java
index 8b5595fbbcd08464a8cc6efe3ffd34a5cc04d778..1ee7f3c1ac1321cb440ee174fb0c9d4d6c4bbe34 100644 (file)
--- a/src/com/vaadin/tests/TestSerialization.java
+++ b/src/com/vaadin/tests/TestSerialization.java
@@ -12,10 +12,18 @@ import junit.framework.TestCase;
 import com.vaadin.data.Item;
 import com.vaadin.data.util.IndexedContainer;
 import com.vaadin.data.util.MethodProperty;
+import com.vaadin.data.validator.RegexpValidator;
 import com.vaadin.ui.Form;
 
 public class TestSerialization extends TestCase {
 
+    public void testValidators() throws Exception {
+        RegexpValidator validator = new RegexpValidator(".*", "Error");
+        validator.isValid("aaa");
+        RegexpValidator validator2 = (RegexpValidator) serializeAndDeserialize(validator);
+        validator2.isValid("aaa");
+    }
+
     public void testForm() throws Exception {
         Form f = new Form();
         String propertyId = "My property";
@@ -56,7 +64,7 @@ public class TestSerialization extends TestCase {
         serializeAndDeserialize(mp);
     }
 
-    private static void serializeAndDeserialize(Serializable s)
+    private static Serializable serializeAndDeserialize(Serializable s)
             throws IOException, ClassNotFoundException {
         // Serialize and deserialize
 
@@ -73,6 +81,8 @@ public class TestSerialization extends TestCase {
         } else {
             System.out.println(s + " does NOT equal " + s2);
         }
+
+        return s2;
     }
 
     public static class Data implements Serializable {