Attempt to fix github issue#99, inclusive Recur

ical4j · Dec 14, 2018 · 13dfe06 · 13dfe06
1 parent b474a6e
commit 13dfe06
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/src/main/java/net/fortuna/ical4j/model/Recur.java b/src/main/java/net/fortuna/ical4j/model/Recur.java
@@ -713,17 +713,14 @@ public final DateList getDates(final Date seed, final Date periodStart,
 
             if (getUntil() != null && candidate != null
                     && candidate.after(getUntil())) {
-
                 break;
             }
             if (periodEnd != null && candidate != null
                     && candidate.after(periodEnd)) {
-
                 break;
             }
             if (getCount() >= 1
                     && (dates.size() + invalidCandidates.size()) >= getCount()) {
-
                 break;
             }
 
@@ -751,13 +748,15 @@ public final DateList getDates(final Date seed, final Date periodStart,
                     if (!candidate.before(seed)) {
                         // candidates exclusive of periodEnd..
                         if (candidate.before(periodStart)
-                                || !candidate.before(periodEnd)) {
+                                || candidate.after(periodEnd)) {
                             invalidCandidates.add(candidate);
                         } else if (getCount() >= 1
                                 && (dates.size() + invalidCandidates.size()) >= getCount()) {
                             break;
-                        } else if (!(getUntil() != null
-                                && candidate.after(getUntil()))) {
+                        } else if (getUntil() instanceof Date
+                                && candidate.compareTo(getUntil()) < 1) {
+                            dates.add(candidate);
+                        } else if (!candidate.before(periodStart) && candidate.before(periodEnd)) {
                             dates.add(candidate);
                         }
                     }