From ce1aaba4e0208505e88ce1507533eaeab1f62321 Mon Sep 17 00:00:00 2001
From: manuzhang <owenzhang1990@gmail.com>
Date: Thu, 20 Oct 2016 15:06:01 +0800
Subject: [PATCH] [FLINK-4863] fix trigger context window on merge

---
 .../streaming/runtime/operators/windowing/WindowOperator.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/operators/windowing/WindowOperator.java b/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/operators/windowing/WindowOperator.java
index 4d8f6550d8000..844669cd31b4c 100644
--- a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/operators/windowing/WindowOperator.java
+++ b/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/operators/windowing/WindowOperator.java
@@ -300,7 +300,7 @@ public void merge(W mergeResult,
 							Collection<W> mergedWindows, W stateWindowResult,
 							Collection<W> mergedStateWindows) throws Exception {
 						context.key = key;
-						context.window = mergeResult;
+						context.window = stateWindowResult;
 
 						// store for later use
 						mergeTriggerResult.f0 = context.onMerge(mergedWindows);