[Bedework-commit] caldav r276 - trunk/server/src/org/bedework/caldav/server

[svnadmin at bedework.org]

Author: douglm
Date: 2008-07-07 10:29:02 -0400 (Mon, 07 Jul 2008)
New Revision: 276

Modified:
   trunk/server/src/org/bedework/caldav/server/CaldavCalNode.java
Log:
Changes to avoid source of StaleStateExceptions from hibernate.

Move collection lastmod out of the BwCalendar class into a separate table and class BwLastMod (and BwCollectionLastmod.

Update touchCalendar to only update the lastmod object.


Modified: trunk/server/src/org/bedework/caldav/server/CaldavCalNode.java
===================================================================
--- trunk/server/src/org/bedework/caldav/server/CaldavCalNode.java	2008-07-02 04:01:47 UTC (rev 275)
+++ trunk/server/src/org/bedework/caldav/server/CaldavCalNode.java	2008-07-07 14:29:02 UTC (rev 276)
@@ -373,7 +373,7 @@
     }
 
     try {
-      return DateTimeUtil.fromISODateTimeUTCtoRfc822(cal.getLastmod());
+      return DateTimeUtil.fromISODateTimeUTCtoRfc822(cal.getLastmod().getTimestamp());
     } catch (Throwable t) {
       throw new WebdavException(t);
     }
@@ -556,7 +556,7 @@
       }
 
       if (tag.equals(AppleServerTags.getctag)) {
-        xml.property(tag, cal.getLastmod() + cal.getSequence());
+        xml.property(tag, cal.getLastmod().getTagValue());
 
         return true;
       }