You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by se...@apache.org on 2017/05/06 23:52:09 UTC
flink git commit: [hotfix] [core] Avoid Java 8 specific functions in
MemorySize
Repository: flink
Updated Branches:
refs/heads/master e515b9bb2 -> fde4f9097
[hotfix] [core] Avoid Java 8 specific functions in MemorySize
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/fde4f909
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/fde4f909
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/fde4f909
Branch: refs/heads/master
Commit: fde4f9097461c306f5e783d7a6c87a7799f21467
Parents: e515b9b
Author: Stephan Ewen <se...@apache.org>
Authored: Sun May 7 01:51:29 2017 +0200
Committer: Stephan Ewen <se...@apache.org>
Committed: Sun May 7 01:51:29 2017 +0200
----------------------------------------------------------------------
.../java/org/apache/flink/configuration/MemorySize.java | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/fde4f909/flink-core/src/main/java/org/apache/flink/configuration/MemorySize.java
----------------------------------------------------------------------
diff --git a/flink-core/src/main/java/org/apache/flink/configuration/MemorySize.java b/flink-core/src/main/java/org/apache/flink/configuration/MemorySize.java
index c34c721..800a216 100644
--- a/flink-core/src/main/java/org/apache/flink/configuration/MemorySize.java
+++ b/flink-core/src/main/java/org/apache/flink/configuration/MemorySize.java
@@ -212,13 +212,15 @@ public class MemorySize implements java.io.Serializable {
}
}
- try {
- return Math.multiplyExact(value, multiplier);
- }
- catch (ArithmeticException e) {
+ final long result = value * multiplier;
+
+ // check for overflow
+ if (result / multiplier != value) {
throw new IllegalArgumentException("The value '" + text +
"' cannot be re represented as 64bit number of bytes (numeric overflow).");
}
+
+ return result;
}
private static boolean matchesAny(String str, String[] variants) {