[Bedework-commit] calendarapi r814 - trunk/icalendar/src/org/bedework/icalendar

[svnadmin at bedework.org]

Author: douglm
Date: 2009-02-23 01:24:17 -0500 (Mon, 23 Feb 2009)
New Revision: 814

Modified:
   trunk/icalendar/src/org/bedework/icalendar/BwEventUtil.java
Log:
Fix a couple of bugs:

No longer support trash - fix the jsp.
ical translation didn't like null calendar

Modified: trunk/icalendar/src/org/bedework/icalendar/BwEventUtil.java
===================================================================
--- trunk/icalendar/src/org/bedework/icalendar/BwEventUtil.java	2009-02-23 06:03:08 UTC (rev 813)
+++ trunk/icalendar/src/org/bedework/icalendar/BwEventUtil.java	2009-02-23 06:24:17 UTC (rev 814)
@@ -314,8 +314,11 @@
         ev.setCreatorHref(cb.getUser().getPrincipalRef());
         ev.setOwnerHref(cb.getOwner().getPrincipalRef());
         ev.setUid(guid);
-        ev.setColPath(cal.getPath());
 
+        if (cal != null) {
+          ev.setColPath(cal.getPath());
+        }
+
         chg.changed(Property.UID); // get that out of the way
         evinfo.setEvent(ev);
         evinfo.setNewEvent(true);