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

[svnadmin at bedework.org]

Author: douglm
Date: 2008-07-18 10:44:32 -0400 (Fri, 18 Jul 2008)
New Revision: 671

Modified:
   releases/bedework-3.4.1.1a/calCore/src/org/bedework/calcore/hibernate/CoreEvents.java
Log:
Missed check for null result due to no access

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-07-18 14:44:10 UTC (rev 670)
+++ releases/bedework-3.4.1.1a/calCore/src/org/bedework/calcore/hibernate/CoreEvents.java	2008-07-18 14:44:32 UTC (rev 671)
@@ -510,7 +510,13 @@
       }
 
       for (BwEvent mstr: masters) {
-        ceis.add(postGetEvent(mstr, desiredAccess, returnResultAlways));
+        CoreEventInfo cei = postGetEvent(mstr, desiredAccess, returnResultAlways);
+
+        if (cei != null)  {
+          // Access was not denied
+
+          ceis.add(cei);
+        }
       }
     }