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

[svnadmin at bedework.org]

Author: douglm
Date: 2008-05-15 11:20:10 -0400 (Thu, 15 May 2008)
New Revision: 624

Modified:
   trunk/calCore/src/org/bedework/calcore/hibernate/CoreCalendars.java
   trunk/calsvc/src/org/bedework/calsvc/Calendars.java
Log:
Fixes to the last update s that deletions work correctly.

Modified: trunk/calCore/src/org/bedework/calcore/hibernate/CoreCalendars.java
===================================================================
--- trunk/calCore/src/org/bedework/calcore/hibernate/CoreCalendars.java	2008-05-15 15:03:44 UTC (rev 623)
+++ trunk/calCore/src/org/bedework/calcore/hibernate/CoreCalendars.java	2008-05-15 15:20:10 UTC (rev 624)
@@ -453,6 +453,7 @@
       throw new CalFacadeException(CalFacadeException.calendarNotFound);
     }
 
+    val = unwrap(val);
     Collection<BwCalendar> cals = val.getChildren();
     if ((cals != null) && (cals.size() > 0)) {
       throw new CalFacadeException(CalFacadeException.calendarNotEmpty);

Modified: trunk/calsvc/src/org/bedework/calsvc/Calendars.java
===================================================================
--- trunk/calsvc/src/org/bedework/calsvc/Calendars.java	2008-05-15 15:03:44 UTC (rev 623)
+++ trunk/calsvc/src/org/bedework/calsvc/Calendars.java	2008-05-15 15:20:10 UTC (rev 624)
@@ -225,7 +225,7 @@
     if (!emptyIt) {
       /** Only allow delete if not in use
        */
-      if (getSvc().getCal().isEmpty(val)) {
+      if (!getSvc().getCal().isEmpty(val)) {
         return 2;
       }
     }