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

[svnadmin at bedework.org]

Author: douglm
Date: 2007-03-27 01:19:47 -0400 (Tue, 27 Mar 2007)
New Revision: 240

Modified:
   trunk/icalendar/src/org/bedework/icalendar/Icalendar.java
Log:
Tidy up exception handling in CalDAV filter processing.
Handle negated property text match

Modified: trunk/icalendar/src/org/bedework/icalendar/Icalendar.java
===================================================================
--- trunk/icalendar/src/org/bedework/icalendar/Icalendar.java	2007-03-25 03:05:55 UTC (rev 239)
+++ trunk/icalendar/src/org/bedework/icalendar/Icalendar.java	2007-03-27 05:19:47 UTC (rev 240)
@@ -293,7 +293,13 @@
     }
 
     if (getComponentType() == ComponentType.freebusy) {
-      return ((BwFreeBusy)iterator().next()).getOrganizer();
+      Object o = iterator().next();
+
+      if (o instanceof EventInfo) {
+        EventInfo ei = (EventInfo)o;
+        return ei.getEvent().getOrganizer();
+      }
+      return ((BwFreeBusy)o).getOrganizer();
     }
 
     return null;