Skip to content
Permalink
Browse files

Automatic merge of jdk:master into master

  • Loading branch information
duke
duke committed Jul 30, 2020
2 parents 3bbfba6 + 79f02a6 commit 93c8d6dc3c5cbc5f08e214d8abb29b2f10967922
@@ -61,8 +61,7 @@ public long getTotalSwapSpaceSize() {
// it can use as much memory as the host's OS allows.
long memLimit = containerMetrics.getMemoryLimit();
if (limit >= 0 && memLimit >= 0) {
// we see a limit == 0 on some machines where "kernel does not support swap limit capabilities"
return (limit < memLimit) ? 0 : limit - memLimit;
return limit - memLimit; // might potentially be 0 for limit == memLimit
}
}
return getTotalSwapSpaceSize0();

0 comments on commit 93c8d6d

Please sign in to comment.