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

Avoid NPE problems when querying the list of posts in the console (#3068) 

#### What type of PR is this?
/kind improvement
/area core
/milestone 2.1.x

#### What this PR does / why we need it:
迁移后文章过多，当文章的 Reconciler 还没有执行完时访问 Console 端文章列表会因为 post.status  为 Null 出现 NPE 问题
使用文章的 status 时需要对其进行判空

/cherry-pick release-2.0
#### Which issue(s) this PR fixes:

Fixes #3066

#### Special notes for your reviewer:
/cc @halo-dev/sig-halo 
#### Does this PR introduce a user-facing change?

```release-note
None
```
pull/3076/head
guqing 2022-12-29 17:42:33 +08:00 committed by GitHub
parent 313605d52c
commit 5dbd5a06ed
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/run/halo/app/content/impl/PostServiceImpl.java
View File

@ -93,7 +93,7 @@ public class PostServiceImpl implements PostService {
Predicate<Post> paramPredicate = post -> Predicate<Post> paramPredicate = post ->
contains(query.getCategories(), post.getSpec().getCategories()) contains(query.getCategories(), post.getSpec().getCategories())
&& contains(query.getTags(), post.getSpec().getTags()) && contains(query.getTags(), post.getSpec().getTags())
&& contains(query.getContributors(), post.getStatus().getContributors()); && contains(query.getContributors(), post.getStatusOrDefault().getContributors());
String keyword = query.getKeyword(); String keyword = query.getKeyword();
if (keyword != null) { if (keyword != null) {
@ -162,7 +162,7 @@ public class PostServiceImpl implements PostService {
) )
.flatMap(lp -> setTags(post.getSpec().getTags(), lp)) .flatMap(lp -> setTags(post.getSpec().getTags(), lp))
.flatMap(lp -> setCategories(post.getSpec().getCategories(), lp)) .flatMap(lp -> setCategories(post.getSpec().getCategories(), lp))
.flatMap(lp -> setContributors(post.getStatus().getContributors(), lp)) .flatMap(lp -> setContributors(post.getStatusOrDefault().getContributors(), lp))
.flatMap(lp -> setOwner(post.getSpec().getOwner(), lp)); .flatMap(lp -> setOwner(post.getSpec().getOwner(), lp));
} }

3
src/main/java/run/halo/app/content/impl/SinglePageServiceImpl.java
View File

@ -14,7 +14,6 @@ import java.util.function.Predicate;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.context.ApplicationContext;
import org.springframework.dao.OptimisticLockingFailureException; import org.springframework.dao.OptimisticLockingFailureException;
import org.springframework.security.core.context.ReactiveSecurityContextHolder; import org.springframework.security.core.context.ReactiveSecurityContextHolder;
import org.springframework.security.core.context.SecurityContext; import org.springframework.security.core.context.SecurityContext;
@ -60,8 +59,6 @@ public class SinglePageServiceImpl implements SinglePageService {
private final CounterService counterService; private final CounterService counterService;
private final ApplicationContext applicationContext;
@Override @Override
public Mono<ListResult<ListedSinglePage>> list(SinglePageQuery query) { public Mono<ListResult<ListedSinglePage>> list(SinglePageQuery query) {
Comparator<SinglePage> comparator = Comparator<SinglePage> comparator =