github
/
halo
mirror of https://github.com/halo-dev/halo
1
0
Fork 0
Code Issues Releases Wiki Activity

fix: NPE when saving system configuration (#6417) 

#### What type of PR is this?
/kind bug
/area core
/milestone 2.18.x

#### What this PR does / why we need it:
修复保存系统配置时出现的 NPE 问题

此问题由于 PR #6346 导致
#### Which issue(s) this PR fixes:
Fixes #6416

#### Does this PR introduce a user-facing change?
```release-note
None
```
pull/6390/head^2
guqing 2024-07-31 12:10:02 +08:00 committed by GitHub
parent 8e8599b3c7
commit 0110438854
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
application/src/main/java/run/halo/app/plugin/DefaultReactiveSettingFetcher.java
View File

@ -7,6 +7,7 @@ import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.node.JsonNodeFactory; import com.fasterxml.jackson.databind.node.JsonNodeFactory;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
import java.util.Map; import java.util.Map;
import java.util.Objects;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeansException; import org.springframework.beans.BeansException;
import org.springframework.beans.factory.DisposableBean; import org.springframework.beans.factory.DisposableBean;
@ -186,7 +187,7 @@ public class DefaultReactiveSettingFetcher
@Override @Override
public Controller setupWith(ControllerBuilder builder) { public Controller setupWith(ControllerBuilder builder) {
ExtensionMatcher matcher = ExtensionMatcher matcher =
extension -> configMapName.equals(extension.getMetadata().getName()); extension -> Objects.equals(extension.getMetadata().getName(), configMapName);
return builder return builder
.extension(new ConfigMap()) .extension(new ConfigMap())
.syncAllOnStart(true) .syncAllOnStart(true)