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

[svnadmin at bedework.org]

Author: douglm
Date: 2008-05-22 10:52:09 -0400 (Thu, 22 May 2008)
New Revision: 629

Modified:
   releases/bedework-3.4.1.1/calCore/src/org/bedework/calcore/hibernate/CoreCalendars.java
Log:
Make collection rename work.

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-22 14:51:39 UTC (rev 628)
+++ releases/bedework-3.4.1.1/calCore/src/org/bedework/calcore/hibernate/CoreCalendars.java	2008-05-22 14:52:09 UTC (rev 629)
@@ -323,13 +323,13 @@
     /* update will check access
      */
 
+    BwCalendar parent = val.getCalendar();
+
     /* Ensure the name isn't reserved and the path is unique */
-    if (!checkNewCalendarName(val.getName(), false, val.getCalendar())) {
+    if (!checkNewCalendarName(newName, false, parent)) {
       throw new CalFacadeException(CalFacadeException.duplicateCalendar);
     }
 
-    BwCalendar parent = val.getCalendar();
-
     val.setName(newName);
 
     /* This triggers off a cascade of updates down the tree as we are storing the