Return-Path: <commits-return-10423-archive-asf-public=cust-asf.ponee.io@flink.apache.org>
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 E6C5D200BFB
	for <archive-asf-public-internal@cust-asf2.ponee.io>; Wed, 11 Jan 2017 12:15:47 +0100 (CET)
Received: by cust-asf.ponee.io (Postfix)
	id E56E7160B54; Wed, 11 Jan 2017 11:15:47 +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 3F5E9160B51
	for <archive-asf-public@cust-asf.ponee.io>; Wed, 11 Jan 2017 12:15:47 +0100 (CET)
Received: (qmail 75218 invoked by uid 500); 11 Jan 2017 11:15:46 -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 75049 invoked by uid 99); 11 Jan 2017 11:15:46 -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; Wed, 11 Jan 2017 11:15:46 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33)
	id 3CDAEDFDF0; Wed, 11 Jan 2017 11:15:46 +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
Date: Wed, 11 Jan 2017 11:15:51 -0000
Message-Id: <a7dfa91bdca740168c36a063b0da6afe@git.apache.org>
In-Reply-To: <9e5f71b17e334c82b21fb7ff00929a50@git.apache.org>
References: <9e5f71b17e334c82b21fb7ff00929a50@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [6/6] flink git commit: [FLINK-5320] Fix result TypeInformation in
 WindowedStream.fold
archived-at: Wed, 11 Jan 2017 11:15:48 -0000

[FLINK-5320] Fix result TypeInformation in WindowedStream.fold


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

Branch: refs/heads/master
Commit: 274cc41a6a43e95243d6e7b3110e16ff6f0ad633
Parents: 2af939a
Author: Yassine Marzougui <y.marzougui@mindlytix.com>
Authored: Tue Dec 13 11:05:50 2016 +0100
Committer: Aljoscha Krettek <aljoscha.krettek@gmail.com>
Committed: Wed Jan 11 10:35:47 2017 +0100

----------------------------------------------------------------------
 .../org/apache/flink/streaming/api/datastream/WindowedStream.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flink/blob/274cc41a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/datastream/WindowedStream.java
----------------------------------------------------------------------
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/datastream/WindowedStream.java b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/datastream/WindowedStream.java
index a18a59c..e2f930a 100644
--- a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/datastream/WindowedStream.java
+++ b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/datastream/WindowedStream.java
@@ -389,7 +389,7 @@ public class WindowedStream<T, K, W extends Window> {
 			Utils.getCallLocationName(), true);
 
 		TypeInformation<R> resultType = TypeExtractor.getUnaryOperatorReturnType(
-			function, WindowFunction.class, true, true, getInputType(), null, false);
+			function, WindowFunction.class, true, true, foldAccumulatorType, null, false);
 
 		return fold(initialValue, foldFunction, function, foldAccumulatorType, resultType);
 	}