flink-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fhue...@apache.org
Subject [1/3] flink git commit: [FLINK-3732] [core] Fix potential null deference in ExecutionConfig#equals()
Date Fri, 15 Apr 2016 18:52:22 GMT
Repository: flink
Updated Branches:
  refs/heads/release-1.0 aadc5fad5 -> c1eb247e9


[FLINK-3732] [core] Fix potential null deference in ExecutionConfig#equals()


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

Branch: refs/heads/release-1.0
Commit: 5b69dd8ce5485d6f8cbd4d94d1ea1870efb53c6a
Parents: aadc5fa
Author: Tianji Li <tianji.li@alcatel-lucent.com>
Authored: Mon Apr 11 13:56:34 2016 -0400
Committer: Fabian Hueske <fhueske@apache.org>
Committed: Fri Apr 15 14:07:42 2016 +0200

----------------------------------------------------------------------
 .../main/java/org/apache/flink/api/common/ExecutionConfig.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flink/blob/5b69dd8c/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 ffd30e9..c95b197 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
@@ -650,7 +650,8 @@ public class ExecutionConfig implements Serializable {
 				Objects.equals(executionMode, other.executionMode) &&
 				useClosureCleaner == other.useClosureCleaner &&
 				parallelism == other.parallelism &&
-				restartStrategyConfiguration.equals(other.restartStrategyConfiguration) &&
+				((restartStrategyConfiguration == null && other.restartStrategyConfiguration
== null) ||
+					(null != restartStrategyConfiguration && restartStrategyConfiguration.equals(other.restartStrategyConfiguration)))
&&
 				forceKryo == other.forceKryo &&
 				objectReuse == other.objectReuse &&
 				autoTypeRegistrationEnabled == other.autoTypeRegistrationEnabled &&


Mime
View raw message