You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tapestry.apache.org by hl...@apache.org on 2010/04/19 20:20:16 UTC
svn commit: r935694 - in /tapestry/tapestry5/trunk/tapestry-core/src:
main/java/org/apache/tapestry5/internal/beaneditor/ValidateAnnotationConstraintGenerator.java
test/java/org/apache/tapestry5/integration/app1/data/Person.java
Author: hlship
Date: Mon Apr 19 18:20:15 2010
New Revision: 935694
URL: http://svn.apache.org/viewvc?rev=935694&view=rev
Log:
TAP5-728: When using the @Validate annotation, spaces around the commas that separate contraints cause runtime exceptions
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/beaneditor/ValidateAnnotationConstraintGenerator.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/data/Person.java
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/beaneditor/ValidateAnnotationConstraintGenerator.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/beaneditor/ValidateAnnotationConstraintGenerator.java?rev=935694&r1=935693&r2=935694&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/beaneditor/ValidateAnnotationConstraintGenerator.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/beaneditor/ValidateAnnotationConstraintGenerator.java Mon Apr 19 18:20:15 2010
@@ -28,7 +28,7 @@ import java.util.regex.Pattern;
public class ValidateAnnotationConstraintGenerator implements ValidationConstraintGenerator
{
- static final String VALIDATOR_PATTERN="(?<!\\\\),(?!([0-9]*\\}))";
+ static final String VALIDATOR_PATTERN="(?<!\\\\)\\s*,\\s*(?!([0-9]*\\}))";
private final Pattern validatorPattern;
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/data/Person.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/data/Person.java?rev=935694&r1=935693&r2=935694&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/data/Person.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/data/Person.java Mon Apr 19 18:20:15 2010
@@ -18,7 +18,7 @@ import org.apache.tapestry5.beaneditor.V
public class Person
{
- @Validate("required,minlength=5")
+ @Validate("required , minlength=5")
private String name;
@Validate("required,min=1")