Merge pull request #21 from fm-tibco/master

fix time windows for aggregate activity
project-flogo · May 2, 2019 · 01ce096 · 01ce096
2 parents 077456f + 995c8b9
commit 01ce096
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/activity/aggregate/activity.go b/activity/aggregate/activity.go
@@ -158,12 +158,12 @@ func (a *Activity) createWindow(ctx activity.Context) (w window.Window, err erro
 		w, err = NewSlidingWindow(settings.Function, windowSettings)
 	case "timetumbling":
 		w, err = NewTumblingTimeWindow(settings.Function, windowSettings)
-		if err != nil && timerSupported {
+		if err == nil && timerSupported {
 			err = timerSupport.CreateTimer(time.Duration(settings.WindowSize)*time.Millisecond, a.moveWindow, true)
 		}
 	case "timesliding":
 		w, err = NewSlidingTimeWindow(settings.Function, windowSettings)
-		if err != nil && timerSupported {
+		if err == nil && timerSupported {
 			err = timerSupport.CreateTimer(time.Duration(settings.Resolution)*time.Millisecond, a.moveWindow, true)
 		}
 	default: