NPE check before metrics sum

germanosin · germanosin · commit 1e249cb7a583 · 2021-01-20T12:26:07.000+03:00
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/cluster/mapper/ClusterMapper.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/cluster/mapper/ClusterMapper.java
@@ -64,7 +64,11 @@ default BrokerDiskUsage map(Integer id, InternalBrokerDiskUsage internalBrokerDi
      }
 
      default BigDecimal sumMetrics(Map<String, BigDecimal> metrics) {
-         return metrics.values().stream().reduce(BigDecimal.ZERO, BigDecimal::add);
+         if (metrics == null) {
+           return metrics.values().stream().reduce(BigDecimal.ZERO, BigDecimal::add);
+         } else {
+           return BigDecimal.ZERO;
+         }
      }
 
      default Path resolvePath(String path) {

Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,11 @@ default BrokerDiskUsage map(Integer id, InternalBrokerDiskUsage internalBrokerDi`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`default BigDecimal sumMetrics(Map<String, BigDecimal> metrics) {`
`67`		`- return metrics.values().stream().reduce(BigDecimal.ZERO, BigDecimal::add);`
	`67`	`+ if (metrics == null) {`
	`68`	`+ return metrics.values().stream().reduce(BigDecimal.ZERO, BigDecimal::add);`
	`69`	`+ } else {`
	`70`	`+ return BigDecimal.ZERO;`
	`71`	`+ }`
`68`	`72`	`}`
`69`	`73`
`70`	`74`	`default Path resolvePath(String path) {`