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

[jsondb] Restore zero byte files from backup #2155

Merged
merged 2 commits into from
Jan 26, 2021
Merged

[jsondb] Restore zero byte files from backup #2155

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dd3b6a9
[jsondb] Restore zero byte files from backup
MikeJMajor Jan 25, 2021
89b418e
Also handle zero byte backup files
MikeJMajor Jan 25, 2021
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: 5 additions & 0 deletions ...b.core.storage.json/src/main/java/org/openhab/core/storage/json/internal/JsonStorage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,11 @@ public Collection<String> getKeys() {

@SuppressWarnings("unchecked")
private @Nullable Map<String, StorageEntry> readDatabase(File inputFile) {
if (inputFile.length() == 0) {
logger.warn("Json storage file at '{}' is empty - ignoring corrupt file.", inputFile.getAbsolutePath());
return null;
}

try {
final Map<String, StorageEntry> inputMap = new ConcurrentHashMap<>();

Expand Down