From 8f31821e1d21a1ba12aca2eb3f081b8b9a72c338 Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Fri, 20 Jul 2012 19:07:03 +0000
Subject: [PATCH] Monotone-Parent: c9c54e20cc8e010c29ef8e5fa1cbd039c35e5344
 Monotone-Revision: 7eb19f1f060daa6cb0a2421481ec351910c3af68

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-07-20T19:07:03
---
 ChangeLog                                      | 7 +++++++
 SoObjects/Appointments/SOGoAppointmentFolder.m | 5 +++++
 2 files changed, 12 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 84e07e25c..3ae8b8e02 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2012-07-20  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* SoObjects/Appointments/SOGoAppointmentFolder.m
+	(_appendCycleException:firstInstanceCalendarDateRange:fromRow:forRange:withTimeZone:toArray:):
+	return immediately if the occurrence does not have a valid
+	recurrence-id.
+
 2012-07-20  Francis Lachapelle  <flachapelle@inverse.ca>
 
 	* UI/WebServerResources/MailerUI.js (onEmailTo): append the email
diff --git a/SoObjects/Appointments/SOGoAppointmentFolder.m b/SoObjects/Appointments/SOGoAppointmentFolder.m
index 29a64b77b..50cdd92f9 100644
--- a/SoObjects/Appointments/SOGoAppointmentFolder.m
+++ b/SoObjects/Appointments/SOGoAppointmentFolder.m
@@ -863,6 +863,11 @@ firstInstanceCalendarDateRange: (NGCalendarDateRange *) fir
 
   newRecord = nil;
   recurrenceId = [component recurrenceId];
+  if (!recurrenceId)
+    {
+      [self errorWithFormat: @"ignored component with an empty EXCEPTION-ID"];
+      return;
+    }
   
   if (tz)
     {