Merge pull request #607 from rohitsardesai83/automated-cherry-pick-of-#563-upstream-release-0.3v0.3.0origin/release-0.3

Automated cherry pick of #563: Handled the case of invalid action in scheduler module

1 files changed, 6 insertions, 0 deletions

diff --git a/device/bluetooth_mapper/scheduler/scheduler.go b/device/bluetooth_mapper/scheduler/scheduler.go
index cf758d252..3f0695941 100644
--- a/device/bluetooth_mapper/scheduler/scheduler.go
+++ b/device/bluetooth_mapper/scheduler/scheduler.go
@@ -78,9 +78,11 @@ func (schedule *Schedule) ExecuteSchedule(actionManager []actionmanager.Action,
 // performScheduleOperation is responsible for performing the operations associated with the schedule
 func (schedule *Schedule) performScheduleOperation(actionManager []actionmanager.Action, dataConverter dataconverter.DataRead, deviceID string) {
 	var scheduleResult ScheduleResult
+	actionExists := false
 	for _, actionName := range schedule.Actions {
 		for _, action := range actionManager {
 			if strings.ToUpper(action.Name) == strings.ToUpper(actionName) {
+				actionExists = true
 				glog.Infof("Performing scheduled operation: %s", action.Name)
 				action.PerformOperation(dataConverter)
 				scheduleResult.EventName = actionName
@@ -92,6 +94,10 @@ func (schedule *Schedule) performScheduleOperation(actionManager []actionmanager
 		if schedule.Interval == 0 {
 			schedule.Interval = defaultEventFrequency
 		}
+		if !actionExists {
+			glog.Error("Action %s does not exist. Exiting from schedule !!!", actionName)
+			break
+		}
 		time.Sleep(time.Duration(time.Duration(schedule.Interval) * time.Millisecond))
 	}
 }