Repository: flink
Updated Branches:
  refs/heads/master e8318d6f4 -> 16ee4a5ce


[hotfix] [streaming] Fix type extraction for joined streams.

This closes #2755.


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

Branch: refs/heads/master
Commit: 16ee4a5ce717987d824593b1f9fdaafa44d98632
Parents: 3458a66
Author: Robert Metzger <[email protected]>
Authored: Fri Nov 4 16:15:26 2016 +0100
Committer: Fabian Hueske <[email protected]>
Committed: Wed Nov 23 18:35:44 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/16ee4a5c/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 c005310..ed1cbd7 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
@@ -306,7 +306,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(),

Reply via email to