Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 2 additions & 15 deletions src/main/java/org/apache/commons/validator/DateValidator.java
Original file line number Diff line number Diff line change
Expand Up @@ -69,12 +69,7 @@ public boolean isValid(final String value, final Locale locale) {
if (value == null) {
return false;
}
final DateFormat formatter;
if (locale != null) {
formatter = DateFormat.getDateInstance(DateFormat.SHORT, locale);
} else {
formatter = DateFormat.getDateInstance(DateFormat.SHORT, Locale.getDefault());
}
final DateFormat formatter = DateFormat.getDateInstance(DateFormat.SHORT, Validator.toLocale(locale));
formatter.setLenient(false);
try {
formatter.parse(value);
Expand All @@ -97,27 +92,19 @@ public boolean isValid(final String value, final Locale locale) {
* @return true if the date is valid.
*/
public boolean isValid(final String value, final String datePattern, final boolean strict) {

if (value == null
|| datePattern == null
|| datePattern.isEmpty()) {

if (value == null || datePattern == null || datePattern.isEmpty()) {
return false;
}

final SimpleDateFormat formatter = new SimpleDateFormat(datePattern);
formatter.setLenient(false);

try {
formatter.parse(value);
} catch (final ParseException e) {
return false;
}

if (strict && datePattern.length() != value.length()) {
return false;
}

return true;
}

Expand Down
Loading
Loading