[Bedework-commit] calendarapi r256 - trunk/calCore/src/org/bedework/calcore/hibernate

[svnadmin at bedework.org]

Author: douglm
Date: 2007-04-09 12:01:58 -0400 (Mon, 09 Apr 2007)
New Revision: 256

Modified:
   trunk/calCore/src/org/bedework/calcore/hibernate/Events.java
Log:
Fix some recurring event fixes

Modified: trunk/calCore/src/org/bedework/calcore/hibernate/Events.java
===================================================================
--- trunk/calCore/src/org/bedework/calcore/hibernate/Events.java	2007-04-09 13:18:04 UTC (rev 255)
+++ trunk/calCore/src/org/bedework/calcore/hibernate/Events.java	2007-04-09 16:01:58 UTC (rev 256)
@@ -417,9 +417,14 @@
 
     CoreEventInfo cei = postGetEvent(ev, privRead, returnResultAlways);
 
-    Boolean rec = cei.getEvent().getRecurring();
-    if ((rec != null) && rec) {
-      doRecurrence(cei, null, null, recurRetrieval);
+    if (cei != null)  {
+      // Access was not denied
+
+      ev = cei.getEvent();
+      Boolean rec = ev.getRecurring();
+      if ((rec != null) && rec) {
+        doRecurrence(cei, null, null, recurRetrieval);
+      }
     }
 
     return cei;
@@ -1495,11 +1500,13 @@
       BwDateTime dt = (BwDateTime)it.next();
       String rid = dt.getDate();
 
-      for (BwEventProxy pr: overrides) {
-        if (pr.getRecurrenceId().equals(rid)) {
-          // This one is being deleted
-          overrides.remove(pr);
-          break;
+      if (overrides != null) {
+        for (BwEventProxy pr: overrides) {
+          if (pr.getRecurrenceId().equals(rid)) {
+            // This one is being deleted
+            overrides.remove(pr);
+            break;
+          }
         }
       }