flink-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gyf...@apache.org
Subject [2/2] flink git commit: [FLINK-1344] [streaming] Quickfix for the recent webclient support
Date Wed, 28 Jan 2015 14:14:19 GMT
[FLINK-1344] [streaming] Quickfix for the recent  webclient support

Closes #341


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

Branch: refs/heads/master
Commit: c28d96cd625062943cc351b14e55c9eaaa1b1959
Parents: ad45bf1
Author: Gyula Fora <gyfora@apache.org>
Authored: Wed Jan 28 14:29:42 2015 +0100
Committer: Gyula Fora <gyfora@apache.org>
Committed: Wed Jan 28 15:09:06 2015 +0100

----------------------------------------------------------------------
 .../flink/streaming/api/environment/StreamContextEnvironment.java  | 1 +
 .../streaming/api/environment/StreamExecutionEnvironment.java      | 2 +-
 .../flink/streaming/api/environment/StreamPlanEnvironment.java     | 2 ++
 3 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flink/blob/c28d96cd/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/environment/StreamContextEnvironment.java
----------------------------------------------------------------------
diff --git a/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/environment/StreamContextEnvironment.java
b/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/environment/StreamContextEnvironment.java
index a9a5bd3..7d41d2a 100644
--- a/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/environment/StreamContextEnvironment.java
+++ b/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/environment/StreamContextEnvironment.java
@@ -51,6 +51,7 @@ public class StreamContextEnvironment extends StreamExecutionEnvironment
{
 
 	@Override
 	public void execute(String jobName) throws Exception {
+		currentEnvironment = null;
 
 		JobGraph jobGraph;
 		if (jobName == null) {

http://git-wip-us.apache.org/repos/asf/flink/blob/c28d96cd/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/environment/StreamExecutionEnvironment.java
----------------------------------------------------------------------
diff --git a/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/environment/StreamExecutionEnvironment.java
b/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/environment/StreamExecutionEnvironment.java
index 2c10017..45c14c1 100644
--- a/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/environment/StreamExecutionEnvironment.java
+++ b/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/environment/StreamExecutionEnvironment.java
@@ -66,7 +66,7 @@ public abstract class StreamExecutionEnvironment {
 
 	private ExecutionConfig config = new ExecutionConfig();
 
-	private static StreamExecutionEnvironment currentEnvironment;
+	protected static StreamExecutionEnvironment currentEnvironment;
 
 	protected StreamGraph streamGraph;
 

http://git-wip-us.apache.org/repos/asf/flink/blob/c28d96cd/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/environment/StreamPlanEnvironment.java
----------------------------------------------------------------------
diff --git a/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/environment/StreamPlanEnvironment.java
b/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/environment/StreamPlanEnvironment.java
index 412dcd0..1cff7e7 100644
--- a/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/environment/StreamPlanEnvironment.java
+++ b/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/environment/StreamPlanEnvironment.java
@@ -49,6 +49,7 @@ public class StreamPlanEnvironment extends StreamExecutionEnvironment {
 
 	@Override
 	public void execute(String jobName) throws Exception {
+		currentEnvironment = null;
 
 		streamGraph.setJobName(jobName);
 
@@ -57,6 +58,7 @@ public class StreamPlanEnvironment extends StreamExecutionEnvironment {
 		} else if (env instanceof PreviewPlanEnvironment) {
 			((PreviewPlanEnvironment) env).setPreview(streamGraph.getStreamingPlanAsJSON());
 		}
+
 		throw new Client.ProgramAbortException();
 	}
 }


Mime
View raw message