[Bedework-commit] calendarapi r740 - releases/bedework-3.4.1.1a/calCore/src/org/bedework/calcore/hibernate

[svnadmin at bedework.org]

Author: douglm
Date: 2008-11-13 10:29:11 -0500 (Thu, 13 Nov 2008)
New Revision: 740

Modified:
   releases/bedework-3.4.1.1a/calCore/src/org/bedework/calcore/hibernate/CoreEvents.java
Log:
Fix bug that caused us to miss an override if the search date range did not include the original instance.

Modified: releases/bedework-3.4.1.1a/calCore/src/org/bedework/calcore/hibernate/CoreEvents.java
===================================================================
--- releases/bedework-3.4.1.1a/calCore/src/org/bedework/calcore/hibernate/CoreEvents.java	2008-11-13 15:21:33 UTC (rev 739)
+++ releases/bedework-3.4.1.1a/calCore/src/org/bedework/calcore/hibernate/CoreEvents.java	2008-11-13 15:29:11 UTC (rev 740)
@@ -360,10 +360,12 @@
       doRecurrence(cei, null, cals, annMap, instMap, checked,
                    recurRetrieval, freeBusy);
       if (recurRetrieval.mode == Rmode.expanded) {
-        Collection<CoreEventInfo> instances = cei.getInstances();
+        if (cei.getInstances() != null) {
+          res.addAll(cei.getInstances());
+        }
 
-        if (instances != null) {
-          res.addAll(instances);
+        if (cei.getOverrides() != null) {
+          res.addAll(cei.getOverrides());
         }
       } else {
         res.add(cei);