You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by gy...@apache.org on 2015/08/04 10:13:22 UTC
flink git commit: Remove unwanted check null of input1 in
ConnectedDataStream
Repository: flink
Updated Branches:
refs/heads/master 77b747158 -> d570d078a
Remove unwanted check null of input1 in ConnectedDataStream
Closes #978
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/d570d078
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/d570d078
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/d570d078
Branch: refs/heads/master
Commit: d570d078ae8e566586bf82bd7d3adc7775e30e2f
Parents: 77b7471
Author: ffbin <86...@qq.com>
Authored: Tue Aug 4 11:30:58 2015 +0800
Committer: Gyula Fora <gy...@apache.org>
Committed: Tue Aug 4 10:11:19 2015 +0200
----------------------------------------------------------------------
.../flink/streaming/api/datastream/ConnectedDataStream.java | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/d570d078/flink-staging/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/datastream/ConnectedDataStream.java
----------------------------------------------------------------------
diff --git a/flink-staging/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/datastream/ConnectedDataStream.java b/flink-staging/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/datastream/ConnectedDataStream.java
index b28f80b..079f136 100644
--- a/flink-staging/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/datastream/ConnectedDataStream.java
+++ b/flink-staging/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/datastream/ConnectedDataStream.java
@@ -60,9 +60,8 @@ public class ConnectedDataStream<IN1, IN2> {
protected ConnectedDataStream(DataStream<IN1> input1, DataStream<IN2> input2) {
this.jobGraphBuilder = input1.streamGraph;
this.environment = input1.environment;
- if (input1 != null) {
- this.dataStream1 = input1.copy();
- }
+ this.dataStream1 = input1.copy();
+
if (input2 != null) {
this.dataStream2 = input2.copy();
}