lingwei.kong/hawkbit
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Fix NPE when DMF Status Messages contain null element (#2119)

Browse Source 
Co-authored-by: vasilchev <vasil.ilchev@bosch.com>
This commit is contained in:
Vasil Ilchev
2024-12-05 11:25:09 +02:00
committed by GitHub
parent b4215a9d76
commit 1d52d3b102
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/builder/AbstractActionStatusCreate.java
View File

@@ -12,6 +12,7 @@ package org.eclipse.hawkbit.repository.builder;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.Objects;
import java.util.Optional;
import java.util.stream.Collectors;
@@ -51,18 +52,20 @@ public abstract class AbstractActionStatusCreate<T> {
public T messages(final Collection<String> messages) {
if (this.messages == null) {
// create modifiable list
this.messages = messages.stream().map(String::strip).collect(Collectors.toCollection(ArrayList::new));
this.messages = messages.stream().filter(Objects::nonNull).map(String::strip).collect(Collectors.toCollection(ArrayList::new));
} else {
this.messages.addAll(messages.stream().map(String::strip).toList());
this.messages.addAll(messages.stream().filter(Objects::nonNull).map(String::strip).toList());
}
return (T) this;
}
public T message(final String message) {
if (this.messages == null) {
this.messages = new ArrayList<>();
if (message != null) {
if (this.messages == null) {
this.messages = new ArrayList<>();
}
this.messages.add(message.strip());
}
this.messages.add(message.strip());
return (T) this;
}