Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix the problem jsonToCacheWrapper crashes when cache value is not JSON format #1695

Merged
merged 3 commits into from
Mar 2, 2022
Merged

Fix the problem jsonToCacheWrapper crashes when cache value is not JSON format #1695

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1c72c84
fix: json to cache wrapper convertor when other exception
guqing Mar 2, 2022
d1db03f
feat: Add test case for level cache
guqing Mar 2, 2022
eff1f18
fix: code style
guqing Mar 2, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions src/main/java/run/halo/app/cache/AbstractStringCacheStore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package run.halo.app.cache;

import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.core.type.TypeReference;
import java.io.IOException;
import java.util.Optional;
import java.util.concurrent.TimeUnit;
Expand All @@ -22,8 +23,8 @@ protected Optional<CacheWrapper<String>> jsonToCacheWrapper(String json) {
Assert.hasText(json, "json value must not be null");
CacheWrapper<String> cacheWrapper = null;
try {
cacheWrapper = JsonUtils.jsonToObject(json, CacheWrapper.class);
} catch (IOException e) {
cacheWrapper = JsonUtils.jsonToObject(json, new TypeReference<>() {});
} catch (Exception e) {
log.debug("Failed to convert json to wrapper value bytes: [{}]", json, e);
}
return Optional.ofNullable(cacheWrapper);
Expand Down