You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by fh...@apache.org on 2016/04/15 19:39:50 UTC
[05/12] flink git commit: [FLINK-3732] [core] Fix potential null
deference in ExecutionConfig#equals()
[FLINK-3732] [core] Fix potential null deference in ExecutionConfig#equals()
This closes #1871
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/f3d3a449
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/f3d3a449
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/f3d3a449
Branch: refs/heads/master
Commit: f3d3a4493ae786d421176396ee68f01a0e6dbb64
Parents: 722155a
Author: Tianji Li <ti...@alcatel-lucent.com>
Authored: Mon Apr 11 13:56:34 2016 -0400
Committer: Fabian Hueske <fh...@apache.org>
Committed: Fri Apr 15 19:38:15 2016 +0200
----------------------------------------------------------------------
.../src/main/java/org/apache/flink/api/common/ExecutionConfig.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/f3d3a449/flink-core/src/main/java/org/apache/flink/api/common/ExecutionConfig.java
----------------------------------------------------------------------
diff --git a/flink-core/src/main/java/org/apache/flink/api/common/ExecutionConfig.java b/flink-core/src/main/java/org/apache/flink/api/common/ExecutionConfig.java
index c02bcad..c27ee74 100644
--- a/flink-core/src/main/java/org/apache/flink/api/common/ExecutionConfig.java
+++ b/flink-core/src/main/java/org/apache/flink/api/common/ExecutionConfig.java
@@ -778,7 +778,7 @@ public class ExecutionConfig implements Serializable {
useClosureCleaner == other.useClosureCleaner &&
parallelism == other.parallelism &&
((restartStrategyConfiguration == null && other.restartStrategyConfiguration == null) ||
- restartStrategyConfiguration.equals(other.restartStrategyConfiguration)) &&
+ (null != restartStrategyConfiguration && restartStrategyConfiguration.equals(other.restartStrategyConfiguration))) &&
forceKryo == other.forceKryo &&
objectReuse == other.objectReuse &&
autoTypeRegistrationEnabled == other.autoTypeRegistrationEnabled &&