Author: niallp
Date: Tue Dec 12 09:00:42 2006
New Revision: 486229
URL: http://svn.apache.org/viewvc?view=rev&rev=486229
Log:
RegexValidator corrections - don't include missing groups and use Pattern's
pattern() method rather than toString()
Modified:
jakarta/commons/proper/validator/trunk/src/share/org/apache/commons/validator/routines/RegexValidator.java
Modified:
jakarta/commons/proper/validator/trunk/src/share/org/apache/commons/validator/routines/RegexValidator.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/validator/trunk/src/share/org/apache/commons/validator/routines/RegexValidator.java?view=diff&rev=486229&r1=486228&r2=486229
==============================================================================
---
jakarta/commons/proper/validator/trunk/src/share/org/apache/commons/validator/routines/RegexValidator.java
(original)
+++
jakarta/commons/proper/validator/trunk/src/share/org/apache/commons/validator/routines/RegexValidator.java
Tue Dec 12 09:00:42 2006
@@ -432,7 +432,10 @@
} else {
StringBuffer buffer = new StringBuffer();
for (int i = 0; i < count; i++) {
- buffer.append(matcher.group(i+1));
+ String component = matcher.group(i+1);
+ if (component != null) {
+ buffer.append(component);
+ }
}
return buffer.toString();
}
@@ -447,7 +450,7 @@
*/
public String toString() {
if (pattern != null) {
- return "RegexValidator{" + pattern.toString() + "}";
+ return "RegexValidator{" + pattern.pattern() + "}";
} else {
return "RegexValidator[" + patterns.length + "]";
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
