[Bedework-commit] calendarapi r258 - in trunk: calCore/src/org/bedework/calcore/hibernate calsvc/src/org/bedework/calsvc

[svnadmin at bedework.org]

Author: douglm
Date: 2007-04-10 13:24:04 -0400 (Tue, 10 Apr 2007)
New Revision: 258

Modified:
   trunk/calCore/src/org/bedework/calcore/hibernate/Events.java
   trunk/calsvc/src/org/bedework/calsvc/CalSvc.java
Log:
Fix depth error in CalDAV freebusy reports.

Remove access cehck in Calsvc getFreeBusy, we cehck at lower levels anyway.

Modified: trunk/calCore/src/org/bedework/calcore/hibernate/Events.java
===================================================================
--- trunk/calCore/src/org/bedework/calcore/hibernate/Events.java	2007-04-10 01:42:49 UTC (rev 257)
+++ trunk/calCore/src/org/bedework/calcore/hibernate/Events.java	2007-04-10 17:24:04 UTC (rev 258)
@@ -247,7 +247,7 @@
                                              boolean allCalendars) throws CalFacadeException {
     boolean ignoreCreator = cb.getSuperUser();
 
-    /* Ensure dates are limited explicitly or mplicitly */
+    /* Ensure dates are limited explicitly or implicitly */
     recurRetrieval = defaultRecurringRetrieval(recurRetrieval,
                                                startDate, endDate);
 

Modified: trunk/calsvc/src/org/bedework/calsvc/CalSvc.java
===================================================================
--- trunk/calsvc/src/org/bedework/calsvc/CalSvc.java	2007-04-10 01:42:49 UTC (rev 257)
+++ trunk/calsvc/src/org/bedework/calsvc/CalSvc.java	2007-04-10 17:24:04 UTC (rev 258)
@@ -1118,7 +1118,7 @@
   }
 
   public boolean isUserRoot(BwCalendar cal) throws CalFacadeException {
-    if (cal == null) {
+    if ((cal == null) || (cal.getPath() == null)) {
       return false;
     }
 
@@ -1454,7 +1454,9 @@
     if (subs != null) {
       // Use these
     } else if (cal != null) {
+      /* Don't check - we do so at the fetch of events
       getCal().checkAccess(cal, PrivilegeDefs.privReadFreeBusy, false);
+      */
 
       BwSubscription sub = BwSubscription.makeSubscription(cal);