Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id A317E200CB4 for ; Mon, 12 Jun 2017 18:55:22 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id A1E77160BDE; Mon, 12 Jun 2017 16:55:22 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 98FBB160BF3 for ; Mon, 12 Jun 2017 18:55:21 +0200 (CEST) Received: (qmail 10684 invoked by uid 500); 12 Jun 2017 16:55:19 -0000 Mailing-List: contact commits-help@beam.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@beam.apache.org Delivered-To: mailing list commits@beam.apache.org Received: (qmail 8876 invoked by uid 99); 12 Jun 2017 16:55:18 -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, 12 Jun 2017 16:55:18 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 93BDFF4A59; Mon, 12 Jun 2017 16:55:17 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: kenn@apache.org To: commits@beam.apache.org Date: Mon, 12 Jun 2017 16:55:51 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [36/50] [abbrv] beam git commit: Fix compile error occurs in some JDKs archived-at: Mon, 12 Jun 2017 16:55:22 -0000 Fix compile error occurs in some JDKs Project: http://git-wip-us.apache.org/repos/asf/beam/repo Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/b7ae7ecf Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/b7ae7ecf Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/b7ae7ecf Branch: refs/heads/gearpump-runner Commit: b7ae7ecffcd08b6a0ccc8296210d36b90306c171 Parents: 1c6861f Author: Mark Liu Authored: Wed Jun 7 16:27:34 2017 -0700 Committer: Thomas Groh Committed: Fri Jun 9 10:54:12 2017 -0700 ---------------------------------------------------------------------- .../runners/flink/FlinkStreamingTransformTranslators.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/beam/blob/b7ae7ecf/runners/flink/src/main/java/org/apache/beam/runners/flink/FlinkStreamingTransformTranslators.java ---------------------------------------------------------------------- diff --git a/runners/flink/src/main/java/org/apache/beam/runners/flink/FlinkStreamingTransformTranslators.java b/runners/flink/src/main/java/org/apache/beam/runners/flink/FlinkStreamingTransformTranslators.java index ef46b63..fef32de 100644 --- a/runners/flink/src/main/java/org/apache/beam/runners/flink/FlinkStreamingTransformTranslators.java +++ b/runners/flink/src/main/java/org/apache/beam/runners/flink/FlinkStreamingTransformTranslators.java @@ -363,8 +363,13 @@ class FlinkStreamingTransformTranslators { Map, OutputTag>> tagsToOutputTags = Maps.newHashMap(); for (Map.Entry, PValue> entry : outputs.entrySet()) { if (!tagsToOutputTags.containsKey(entry.getKey())) { - tagsToOutputTags.put(entry.getKey(), new OutputTag<>(entry.getKey().getId(), - (TypeInformation) context.getTypeInfo((PCollection) entry.getValue()))); + tagsToOutputTags.put( + entry.getKey(), + new OutputTag>( + entry.getKey().getId(), + (TypeInformation) context.getTypeInfo((PCollection) entry.getValue()) + ) + ); } }