Return-Path: 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 691E618BBB for ; Fri, 22 May 2015 12:41:27 +0000 (UTC) Received: (qmail 45524 invoked by uid 500); 22 May 2015 12:41:27 -0000 Delivered-To: apmail-flink-commits-archive@flink.apache.org Received: (qmail 45488 invoked by uid 500); 22 May 2015 12:41:27 -0000 Mailing-List: contact commits-help@flink.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@flink.apache.org Delivered-To: mailing list commits@flink.apache.org Received: (qmail 45479 invoked by uid 99); 22 May 2015 12:41:27 -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; Fri, 22 May 2015 12:41:27 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 1F27DE07D6; Fri, 22 May 2015 12:41:27 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: gyfora@apache.org To: commits@flink.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: flink git commit: [streaming] Minor bugfix in the BarrierBuffer input finishing logic Date: Fri, 22 May 2015 12:41:27 +0000 (UTC) Repository: flink Updated Branches: refs/heads/master 1aad5b759 -> 36c2026fb [streaming] Minor bugfix in the BarrierBuffer input finishing logic Project: http://git-wip-us.apache.org/repos/asf/flink/repo Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/36c2026f Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/36c2026f Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/36c2026f Branch: refs/heads/master Commit: 36c2026fbc19ca3b6929888e784f76a8824011f4 Parents: 1aad5b7 Author: Gyula Fora Authored: Fri May 22 13:50:43 2015 +0200 Committer: Gyula Fora Committed: Fri May 22 14:22:25 2015 +0200 ---------------------------------------------------------------------- .../java/org/apache/flink/streaming/runtime/io/BarrierBuffer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flink/blob/36c2026f/flink-staging/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/runtime/io/BarrierBuffer.java ---------------------------------------------------------------------- diff --git a/flink-staging/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/runtime/io/BarrierBuffer.java b/flink-staging/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/runtime/io/BarrierBuffer.java index bc153f9..8f8325f 100644 --- a/flink-staging/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/runtime/io/BarrierBuffer.java +++ b/flink-staging/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/runtime/io/BarrierBuffer.java @@ -233,7 +233,7 @@ public class BarrierBuffer { LOG.debug("Publishing barrier to the vertex"); } - if (currentSuperstep != null) { + if (currentSuperstep != null && !inputFinished) { reader.publish(currentSuperstep); }