From aaf02b7f6c8f00a0db5a4aec8ae335961a4d99bf Mon Sep 17 00:00:00 2001 From: Nick Burch Date: Wed, 20 Jul 2011 17:44:55 +0000 Subject: [PATCH] ALF-9156 Finish recurring event support in the calendar listing webscript, and add in new unit tests to cover this case git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@29235 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../calendar/cannedqueries/GetCalendarEntriesCannedQuery.java | 1 + .../alfresco/service/cmr/calendar/CalendarRecurrenceHelper.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/source/java/org/alfresco/repo/calendar/cannedqueries/GetCalendarEntriesCannedQuery.java b/source/java/org/alfresco/repo/calendar/cannedqueries/GetCalendarEntriesCannedQuery.java index e08ae30769..30fd3bb1dd 100644 --- a/source/java/org/alfresco/repo/calendar/cannedqueries/GetCalendarEntriesCannedQuery.java +++ b/source/java/org/alfresco/repo/calendar/cannedqueries/GetCalendarEntriesCannedQuery.java @@ -241,6 +241,7 @@ public class GetCalendarEntriesCannedQuery extends AbstractCannedQueryPermission private class CalendarEntryImpl extends org.alfresco.repo.calendar.CalendarEntryImpl { + private static final long serialVersionUID = 5717119409619436964L; private CalendarEntryImpl(CalendarEntity entity) { super( diff --git a/source/java/org/alfresco/service/cmr/calendar/CalendarRecurrenceHelper.java b/source/java/org/alfresco/service/cmr/calendar/CalendarRecurrenceHelper.java index 9e3caabaa1..027456c7fb 100644 --- a/source/java/org/alfresco/service/cmr/calendar/CalendarRecurrenceHelper.java +++ b/source/java/org/alfresco/service/cmr/calendar/CalendarRecurrenceHelper.java @@ -198,7 +198,7 @@ public class CalendarRecurrenceHelper String freq = params.get("FREQ"); String intervalS = params.get("INTERVAL"); int interval = 1; - if(intervalS == null) + if(intervalS != null) { try {