Do not apply implicit ByMonthDayRule when FREQ=MONTHLY and BYDAY is set

ical4j · Feb 8, 2020 · f1dfb00 · f1dfb00
1 parent 493b3c9
commit f1dfb00
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/main/java/net/fortuna/ical4j/model/Recur.java b/src/main/java/net/fortuna/ical4j/model/Recur.java
@@ -944,8 +944,8 @@ private DateList getCandidates(final Calendar rootSeed, final Date date, final V
             if (log.isDebugEnabled()) {
                 log.debug("Dates after BYMONTHDAY processing: " + dates);
             }
-        } else if (frequency == Frequency.MONTHLY || (frequency == Frequency.YEARLY && yearDayList.isEmpty()
-                && weekNoList.isEmpty() && dayList.isEmpty())) {
+        } else if ((frequency == Frequency.MONTHLY && dayList.isEmpty()) ||
+                (frequency == Frequency.YEARLY && yearDayList.isEmpty() && weekNoList.isEmpty() && dayList.isEmpty())) {
 
             NumberList implicitMonthDayList = new NumberList();
             implicitMonthDayList.add(rootSeed.get(Calendar.DAY_OF_MONTH));