Return-Path: 
 <commits-return-7034-apmail-flink-commits-archive=flink.apache.org@flink.apache.org>
X-Original-To: apmail-flink-commits-archive@minotaur.apache.org
Delivered-To: apmail-flink-commits-archive@minotaur.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 668D418BA1
	for <apmail-flink-commits-archive@minotaur.apache.org>;
 Mon, 21 Mar 2016 10:14:22 +0000 (UTC)
Received: (qmail 79997 invoked by uid 500); 21 Mar 2016 10:14:22 -0000
Delivered-To: apmail-flink-commits-archive@flink.apache.org
Received: (qmail 79959 invoked by uid 500); 21 Mar 2016 10:14:22 -0000
Mailing-List: contact commits-help@flink.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@flink.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@flink.apache.org>
List-Post: <mailto:commits@flink.apache.org>
List-Id: <commits.flink.apache.org>
Reply-To: dev@flink.apache.org
Delivered-To: mailing list commits@flink.apache.org
Received: (qmail 79950 invoked by uid 99); 21 Mar 2016 10:14:22 -0000
Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org)
 (140.211.11.23)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 21 Mar 2016 10:14:22 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at
 git1-us-west.apache.org, from userid 33)
	id 245F5DFA42; Mon, 21 Mar 2016 10:14:22 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: aljoscha@apache.org
To: commits@flink.apache.org
Message-Id: <767270b5e70140f9b0e23f10feb9170c@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: flink git commit: [hotfix] Fix ContinuousProcessingTimeTrigger
Date: Mon, 21 Mar 2016 10:14:22 +0000 (UTC)

Repository: flink
Updated Branches:
  refs/heads/release-1.0 2c78be3e9 -> 954cdc113


[hotfix] Fix ContinuousProcessingTimeTrigger


Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/954cdc11
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/954cdc11
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/954cdc11

Branch: refs/heads/release-1.0
Commit: 954cdc113693cac6e68d6d7022e76ddedac29a9f
Parents: 2c78be3
Author: Aljoscha Krettek <aljoscha.krettek@gmail.com>
Authored: Mon Mar 21 10:57:10 2016 +0100
Committer: Aljoscha Krettek <aljoscha.krettek@gmail.com>
Committed: Mon Mar 21 11:13:59 2016 +0100

----------------------------------------------------------------------
 .../api/windowing/triggers/ContinuousProcessingTimeTrigger.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flink/blob/954cdc11/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/windowing/triggers/ContinuousProcessingTimeTrigger.java
----------------------------------------------------------------------
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/windowing/triggers/ContinuousProcessingTimeTrigger.java b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/windowing/triggers/ContinuousProcessingTimeTrigger.java
index eacdf0b..a952c42 100644
--- a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/windowing/triggers/ContinuousProcessingTimeTrigger.java
+++ b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/windowing/triggers/ContinuousProcessingTimeTrigger.java
@@ -58,14 +58,14 @@ public class ContinuousProcessingTimeTrigger<W extends Window> extends Trigger<O
 			long start = currentTime - (currentTime % interval);
 			fireState.update(start + interval);
 
-			ctx.registerProcessingTimeTimer(nextFireTimestamp);
+			ctx.registerProcessingTimeTimer((start + interval));
 			return TriggerResult.CONTINUE;
 		}
 		if (currentTime > nextFireTimestamp) {
 			long start = currentTime - (currentTime % interval);
 			fireState.update(start + interval);
 
-			ctx.registerProcessingTimeTimer(nextFireTimestamp);
+			ctx.registerProcessingTimeTimer((start + interval));
 
 			return TriggerResult.FIRE;
 		}