File tree Expand file tree Collapse file tree
src/main/java/com/cronutils/model/definition Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -53,11 +53,13 @@ public static CronConstraint ensureEitherDayOfWeekOrDayOfMonth() {
5353 @ Override
5454 public boolean validate (Cron cron ) {
5555 CronField dayOfYearField = cron .retrieve (CronFieldName .DAY_OF_YEAR );
56+ CronField dayOfMonthField = cron .retrieve (CronFieldName .DAY_OF_MONTH );
57+ CronField dayOfWeekField = cron .retrieve (CronFieldName .DAY_OF_WEEK );
5658 if (dayOfYearField == null || dayOfYearField .getExpression () instanceof QuestionMark ) {
57- if (!( cron . retrieve ( CronFieldName . DAY_OF_MONTH ) .getExpression () instanceof QuestionMark )) {
58- return cron . retrieve ( CronFieldName . DAY_OF_WEEK ) .getExpression () instanceof QuestionMark ;
59+ if (dayOfMonthField != null && !( dayOfMonthField .getExpression () instanceof QuestionMark )) {
60+ return dayOfWeekField != null && dayOfWeekField .getExpression () instanceof QuestionMark ;
5961 } else {
60- return !( cron . retrieve ( CronFieldName . DAY_OF_WEEK ) .getExpression () instanceof QuestionMark );
62+ return dayOfWeekField != null && !( dayOfWeekField .getExpression () instanceof QuestionMark );
6163 }
6264 }
6365
You can’t perform that action at this time.
0 commit comments