You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by et...@apache.org on 2020/08/26 14:55:53 UTC
[storm] branch master updated: [STORM-3690] fix Ui index page null
pointer error (#3325)
This is an automated email from the ASF dual-hosted git repository.
ethanli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/storm.git
The following commit(s) were added to refs/heads/master by this push:
new 1ab888a [STORM-3690] fix Ui index page null pointer error (#3325)
1ab888a is described below
commit 1ab888a2aed84537f6300c20a43387a56fa92f4a
Author: Rui Li <ru...@verizonmedia.com>
AuthorDate: Wed Aug 26 09:54:46 2020 -0500
[STORM-3690] fix Ui index page null pointer error (#3325)
---
.../resource/normalization/NormalizedResourceRequest.java | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
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 class NormalizedResourceRequest implements NormalizedResourcesWithMemory
*/
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;
}