Fix NPE in ResourceManager when collecting local resource estimation in the profiler.

zhengwei143 · copybara-github · commit 5c4becc5b4b1 · 2024-02-02T02:51:28.000-08:00
Fixes #21133. RELNOTES: None. PiperOrigin-RevId: 603631744 Change-Id: Ied224fd14e2be1465098135e0cab87584bbedb28
diff --git a/src/main/java/com/google/devtools/build/lib/actions/ResourceManager.java b/src/main/java/com/google/devtools/build/lib/actions/ResourceManager.java
@@ -165,13 +165,13 @@ public static ResourceManager instance() {
   /** Returns prediction of RAM in Mb used by registered actions. */
   @Override
   public double getUsedMemoryInMb() {
-    return usedResources.get(ResourceSet.MEMORY);
+    return usedResources.getOrDefault(ResourceSet.MEMORY, 0d);
   }
 
   /** Returns prediction of CPUs used by registered actions. */
   @Override
   public double getUsedCPU() {
-    return usedResources.get(ResourceSet.CPU);
+    return usedResources.getOrDefault(ResourceSet.CPU, 0d);
   }
 
   // Allocated resources are allowed to go "negative", but at least
@@ -207,7 +207,7 @@ public double getUsedCPU() {
 
   // Used amount of resources. Corresponds to the resource
   // definition in the ResourceSet class.
-  private Map<String, Double> usedResources;
+  private Map<String, Double> usedResources = new HashMap<>();
 
   // Used local test count. Corresponds to the local test count definition in the ResourceSet class.
   private int usedLocalTestCount;
