commit 1ab888a2aed84537f6300c20a43387a56fa92f4a
author Rui Li <rui.li@verizonmedia.com> Wed Aug 26 09:54:46 2020 -0500
committer GitHub <noreply@github.com> Wed Aug 26 09:54:46 2020 -0500
tree 46449a168c62602cbfdec3ff274f41b8b8e5f36e
parent bb199d574eae337d0512670dcc4957f3c7ef4922

[STORM-3690] fix Ui index page null pointer error (#3325)

storm-server/src/main/java/org/apache/storm/scheduler/resource/normalization/NormalizedResourceRequest.java

diff --git a/storm-server/src/main/java/org/apache/storm/scheduler/resource/normalization/NormalizedResourceRequest.java b/storm-server/src/main/java/org/apache/storm/scheduler/resource/normalization/NormalizedResourceRequest.java
index a27897e..744ae34 100644
--- a/storm-server/src/main/java/org/apache/storm/scheduler/resource/normalization/NormalizedResourceRequest.java
+++ b/storm-server/src/main/java/org/apache/storm/scheduler/resource/normalization/NormalizedResourceRequest.java
@@ -192,9 +192,11 @@
      */
     public static Map<String, Double> addResourceMap(Map<String, Double> resources1, Map<String, Double> resources2) {
         Map<String, Double> sum = new HashMap<>(resources1);
-        for (Map.Entry<String, Double> me : resources2.entrySet()) {
-            Double cur = sum.getOrDefault(me.getKey(), 0.0) + me.getValue();
-            sum.put(me.getKey(), cur);
+        if (resources2 != null) {
+            for (Map.Entry<String, Double> me : resources2.entrySet()) {
+                Double cur = sum.getOrDefault(me.getKey(), 0.0) + me.getValue();
+                sum.put(me.getKey(), cur);
+            }
         }
         return sum;
     }