flink-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fhue...@apache.org
Subject [3/3] flink git commit: [hotfix] [streaming] Fix type extraction for joined streams.
Date Wed, 23 Nov 2016 20:15:35 GMT
[hotfix] [streaming] Fix type extraction for joined streams.


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

Branch: refs/heads/release-1.1
Commit: 424fb24c3febc2f16004df77c470c01f7ea2337d
Parents: 074b4e6
Author: Robert Metzger <rmetzger@apache.org>
Authored: Fri Nov 4 16:15:26 2016 +0100
Committer: Fabian Hueske <fhueske@apache.org>
Committed: Wed Nov 23 21:08:58 2016 +0100

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


http://git-wip-us.apache.org/repos/asf/flink/blob/424fb24c/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/datastream/JoinedStreams.java
----------------------------------------------------------------------
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/datastream/JoinedStreams.java
b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/datastream/JoinedStreams.java
index 86c6226..a3a4beb 100644
--- a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/datastream/JoinedStreams.java
+++ b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/datastream/JoinedStreams.java
@@ -259,7 +259,7 @@ public class JoinedStreams<T1, T2> {
 		public <T> DataStream<T> apply(FlatJoinFunction<T1, T2, T> function)
{
 			TypeInformation<T> resultType = TypeExtractor.getBinaryOperatorReturnType(
 					function,
-					JoinFunction.class,
+					FlatJoinFunction.class,
 					true,
 					true,
 					input1.getType(),


Mime
View raw message