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

[svnadmin at bedework.org]

Author: douglm
Date: 2008-05-15 23:19:46 -0400 (Thu, 15 May 2008)
New Revision: 625

Modified:
   releases/bedework-3.4.1.1/calCore/src/org/bedework/calcore/hibernate/CoreCalendars.java
Log:
Fix so that deleted collections stay deleted. The previous xml schema change requires that we explicitly delete the object

Modified: releases/bedework-3.4.1.1/calCore/src/org/bedework/calcore/hibernate/CoreCalendars.java
===================================================================
--- releases/bedework-3.4.1.1/calCore/src/org/bedework/calcore/hibernate/CoreCalendars.java	2008-05-15 15:20:10 UTC (rev 624)
+++ releases/bedework-3.4.1.1/calCore/src/org/bedework/calcore/hibernate/CoreCalendars.java	2008-05-16 03:19:46 UTC (rev 625)
@@ -447,11 +447,13 @@
       throw new CalFacadeException(CalFacadeException.calendarNotFound);
     }
 
+    val = unwrap(val);
     if (val.hasChildren()) {
       throw new CalFacadeException(CalFacadeException.calendarNotEmpty);
     }
 
     parent.removeChild(val);
+    sess.delete(val);
     sess.update(parent);
 
     return true;