fixup! [FLINK-14869][core] Discard zero-valued extended resources in …

…ResourceProfile
apache · Feb 18, 2021 · 216d83a · 216d83a
1 parent 1bd2d3d
commit 216d83a
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/...untime/src/main/java/org/apache/flink/runtime/clusterframework/types/ResourceProfile.java b/...untime/src/main/java/org/apache/flink/runtime/clusterframework/types/ResourceProfile.java
@@ -148,7 +148,7 @@ private ResourceProfile(
 
         this.extendedResources =
                 checkNotNull(extendedResources).entrySet().stream()
-                        .filter(entry -> entry.getValue() != null && !entry.getValue().isZero())
+                        .filter(entry -> !checkNotNull(entry.getValue()).isZero())
                         .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
     }
 
@@ -463,7 +463,7 @@ public ResourceProfile multiply(final int multiplier) {
                                         Tuple2.of(
                                                 entry.getKey(),
                                                 entry.getValue().multiply(multiplier)))
-                        .filter(tuple -> tuple.f1 != null && !tuple.f1.isZero())
+                        .filter(tuple -> !tuple.f1.isZero())
                         .collect(Collectors.toMap(tuple -> tuple.f0, tuple -> tuple.f1));
 
         return new ResourceProfile(