Merge pull request #128 from davorbonaci/backport-9

davorbonaci · davorbonaci · commit 12935e5a9f07 · 2016-03-04T14:58:58.000-08:00
Backport apache/beam#9
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/GroupAlsoByWindowViaWindowSetDoFn.java b/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/GroupAlsoByWindowViaWindowSetDoFn.java
@@ -80,10 +80,10 @@ public void processElement(ProcessContext c) throws Exception {
             reduceFn,
             c.getPipelineOptions());
 
+    reduceFnRunner.processElements(element.elementsIterable());
     for (TimerData timer : element.timersIterable()) {
       reduceFnRunner.onTimer(timer);
     }
-    reduceFnRunner.processElements(element.elementsIterable());
     reduceFnRunner.persist();
   }
 

Original file line number	Diff line number	Diff line change
`@@ -80,10 +80,10 @@ public void processElement(ProcessContext c) throws Exception {`
`80`	`80`	`reduceFn,`
`81`	`81`	`c.getPipelineOptions());`
`82`	`82`
	`83`	`+ reduceFnRunner.processElements(element.elementsIterable());`
`83`	`84`	`for (TimerData timer : element.timersIterable()) {`
`84`	`85`	`reduceFnRunner.onTimer(timer);`
`85`	`86`	`}`
`86`		`- reduceFnRunner.processElements(element.elementsIterable());`
`87`	`87`	`reduceFnRunner.persist();`
`88`	`88`	`}`
`89`	`89`