This is an automated email from the ASF dual-hosted git repository.
liuhongyu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hertzbeat.git
The following commit(s) were added to refs/heads/master by this push:
new 47e632a08 [fix] fix byte type npe. (#2659)
47e632a08 is described below
commit 47e632a0889edae2ada7a893c31fcc724f7636e3
Author: b_mountain <[email protected]>
AuthorDate: Tue Sep 3 11:32:05 2024 +0800
[fix] fix byte type npe. (#2659)
Co-authored-by: 刘进山 <[email protected]>
---
.../org/apache/hertzbeat/manager/service/impl/TagServiceImpl.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git
a/manager/src/main/java/org/apache/hertzbeat/manager/service/impl/TagServiceImpl.java
b/manager/src/main/java/org/apache/hertzbeat/manager/service/impl/TagServiceImpl.java
index 02ac69feb..b0508b5d7 100644
---
a/manager/src/main/java/org/apache/hertzbeat/manager/service/impl/TagServiceImpl.java
+++
b/manager/src/main/java/org/apache/hertzbeat/manager/service/impl/TagServiceImpl.java
@@ -18,9 +18,11 @@
package org.apache.hertzbeat.manager.service.impl;
import jakarta.persistence.criteria.Predicate;
+
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
+import java.util.Objects;
import java.util.Optional;
import java.util.Set;
import java.util.stream.Collectors;
@@ -130,7 +132,7 @@ public class TagServiceImpl implements TagService {
@Override
public void deleteMonitorSystemTags(Monitor monitor) {
if (CollectionUtils.isNotEmpty(monitor.getTags())) {
- List<Tag> tags = monitor.getTags().stream().filter(tag ->
tag.getType() == (byte) 0).collect(Collectors.toList());
+ List<Tag> tags = monitor.getTags().stream().filter(tag ->
Objects.nonNull(tag.getType()) && tag.getType() == (byte)
0).collect(Collectors.toList());
tagDao.deleteAll(tags);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
