[Bedework-commit] calendarapi r250 - trunk/calsvc/src/org/bedework/calsvc

[svnadmin at bedework.org]

Author: douglm
Date: 2007-04-05 15:24:08 -0400 (Thu, 05 Apr 2007)
New Revision: 250

Modified:
   trunk/calsvc/src/org/bedework/calsvc/CalSvc.java
Log:
Fix bug when checking subscribed calendar

Also fix webdav principal-match

Modified: trunk/calsvc/src/org/bedework/calsvc/CalSvc.java
===================================================================
--- trunk/calsvc/src/org/bedework/calsvc/CalSvc.java	2007-04-04 17:37:21 UTC (rev 249)
+++ trunk/calsvc/src/org/bedework/calsvc/CalSvc.java	2007-04-05 19:24:08 UTC (rev 250)
@@ -3217,8 +3217,8 @@
     if (calendar == null) {
       /* Assume deleted - flag in the subscription if it's ours or a temp.
        */
-      if ((val.getOwner().equals(getUser())) ||
-          (val.getId() == CalFacadeDefs.unsavedItemKey)) {
+      if ((val.getId() == CalFacadeDefs.unsavedItemKey) ||
+          val.getOwner().equals(getUser())) {
         val.setCalendarDeleted(true);
         if (val.getId() != CalFacadeDefs.unsavedItemKey) {
           // Save the state