[Bedework-commit] bwwebapps r84 - releases/bedework-3.8/webcommon/src/org/bedework/webcommon/event

[svnadmin at bedework.org]

Author: douglm
Date: 2012-04-06 13:38:07 -0400 (Fri, 06 Apr 2012)
New Revision: 84

Modified:
   releases/bedework-3.8/webcommon/src/org/bedework/webcommon/event/UpdateEventAction.java
Log:
Another fix to remove bogus x-props on update

Modified: releases/bedework-3.8/webcommon/src/org/bedework/webcommon/event/UpdateEventAction.java
===================================================================
--- releases/bedework-3.8/webcommon/src/org/bedework/webcommon/event/UpdateEventAction.java	2012-04-05 14:28:37 UTC (rev 83)
+++ releases/bedework-3.8/webcommon/src/org/bedework/webcommon/event/UpdateEventAction.java	2012-04-06 17:38:07 UTC (rev 84)
@@ -797,9 +797,12 @@
     return rdChanged || exdChanged;
   }
 
-  private static final String alwaysRemove =
+  private static final String alwaysRemove1 =
       "BEGIN:VEVENT\r\nUID:123456\r\nDTSTART;TYPE=DATE:20080212T000000\r\n";
 
+  private static final String alwaysRemove2 =
+      "BEGIN:VEVENT\nUID:123456\nDTSTART;TYPE=DATE:20080212T000000\n";
+
   /* return forwardNoAction for no change
    * forward success for change otherwise error.
    */
@@ -838,12 +841,13 @@
 
       for (BwXproperty xp:  evxprops) {
         if (xp.getSkipJsp()) {
-          if (!xp.getName().equals(BwXproperty.bedeworkIcal)) {
+          if (!xp.getName().equals(BwXproperty.bedeworkIcal) ||
+              (xp.getValue() == null)) {
             continue;
           }
 
-          if ((xp.getValue() == null) ||
-              !xp.getValue().startsWith(alwaysRemove)) {
+          if (!xp.getValue().startsWith(alwaysRemove1) &&
+              !xp.getValue().startsWith(alwaysRemove2)) {
             continue;
           }
         }
@@ -884,7 +888,8 @@
       if (xp.getSkipJsp()) {
         if (xp.getName().equals(BwXproperty.bedeworkIcal)) {
           if ((xp.getValue() != null) &&
-              xp.getValue().startsWith(alwaysRemove)) {
+              (xp.getValue().startsWith(alwaysRemove1) ||
+               xp.getValue().startsWith(alwaysRemove2))) {
             continue; // Bogus x-prop - remove it
           }
         }