[hotfix] read from old and new parallelism config key

regression of c635802
MoeweX · Aug 12, 2015 · 7349ef8 · 7349ef8
1 parent a41bc8c
commit 7349ef8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/...re/src/main/java/org/apache/flink/streaming/api/environment/StreamContextEnvironment.java b/...re/src/main/java/org/apache/flink/streaming/api/environment/StreamContextEnvironment.java
@@ -47,7 +47,7 @@ protected StreamContextEnvironment(Client client, List<File> jars, int paralleli
 		} else {
 			// first check for old parallelism config key
 			setParallelism(GlobalConfiguration.getInteger(
-					ConfigConstants.DEFAULT_PARALLELISM_KEY,
+					ConfigConstants.DEFAULT_PARALLELISM_KEY_OLD,
 					ConfigConstants.DEFAULT_PARALLELISM));
 			// then for new
 			setParallelism(GlobalConfiguration.getInteger(

diff --git a/...-core/src/main/java/org/apache/flink/streaming/api/environment/StreamPlanEnvironment.java b/...-core/src/main/java/org/apache/flink/streaming/api/environment/StreamPlanEnvironment.java
@@ -39,7 +39,7 @@ protected StreamPlanEnvironment(ExecutionEnvironment env) {
 		} else {
 			// first check for old parallelism config key
 			setParallelism(GlobalConfiguration.getInteger(
-					ConfigConstants.DEFAULT_PARALLELISM_KEY,
+					ConfigConstants.DEFAULT_PARALLELISM_KEY_OLD,
 					ConfigConstants.DEFAULT_PARALLELISM));
 			// then for new
 			setParallelism(GlobalConfiguration.getInteger(