From ebc6dff7c29a8b0b5702ba6373f529758c818f7d Mon Sep 17 00:00:00 2001
From: Nicholas Blair <nicholas.blair@gmail.com>
Date: Tue, 28 Feb 2012 16:16:10 +0000
Subject: [PATCH] SA-49 make sure to check start/end on recurring events, not
 just recurring period

git-svn-id: https://source.jasig.org/sa/sched-assist/trunk@25906 f5dbab47-78f9-eb45-b975-e544023573eb
---
 .../schedassist/model/VisibleScheduleBuilder.java    | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/sched-assist-api/src/main/java/org/jasig/schedassist/model/VisibleScheduleBuilder.java b/sched-assist-api/src/main/java/org/jasig/schedassist/model/VisibleScheduleBuilder.java
index 0dc60cba..2ccfe2a6 100644
--- a/sched-assist-api/src/main/java/org/jasig/schedassist/model/VisibleScheduleBuilder.java
+++ b/sched-assist-api/src/main/java/org/jasig/schedassist/model/VisibleScheduleBuilder.java
@@ -217,6 +217,11 @@ protected VisibleSchedule calculateVisibleScheduleNoAttendingCheck(Date startTim
 
 			// if we reach this point, this event is not skippable,
 			// it's going to be either BUSY, FREE with visitors, or ATTENDING
+			// whether event is recurring or not, check block on start/end
+			Date startDate = event.getStartDate().getDate();
+			Date endDate = event.getEndDate(true).getDate();
+			mutateAppropriateBlockInVisibleSchedule(visibleSchedule, event, calendarAccount, null, startDate, endDate, false);
+						
 			if(eventUtils.isEventRecurring(event)) {
 				// expand the recurrence rules
 				PeriodList recurrenceList = this.eventUtils.calculateRecurrence(event, startTime, endTime);
@@ -224,12 +229,7 @@ protected VisibleSchedule calculateVisibleScheduleNoAttendingCheck(Date startTim
 					Period period = (Period) o;
 					mutateAppropriateBlockInVisibleSchedule(visibleSchedule, event, calendarAccount, null, period.getStart(), period.getEnd(), false);
 				}
-			} else {	
-				// event is not recurring, just check block on start/end
-				Date startDate = event.getStartDate().getDate();
-				Date endDate = event.getEndDate(true).getDate();
-				mutateAppropriateBlockInVisibleSchedule(visibleSchedule, event, calendarAccount, null, startDate, endDate, false);
-			}
+			} 
 		}
 		
 		return visibleSchedule;