mirrors/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-05-22 04:31:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replace ObjectProperty with atomicRef to prevent problems with background reloading

Browse Source
This commit is contained in:
Armin Schrenk
2021-09-21 12:32:36 +02:00
parent 76811f92e6
commit ae2ad6e00f
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/org/cryptomator/common/vaults/VaultConfigCache.java
View File

@@ -5,14 +5,12 @@ import org.cryptomator.common.settings.VaultSettings;
import org.cryptomator.cryptofs.VaultConfig;
import org.cryptomator.cryptofs.VaultConfigLoadException;
import javafx.beans.property.ObjectProperty;
import javafx.beans.property.SimpleObjectProperty;
import java.io.IOException;
import java.io.UncheckedIOException;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.Objects;
import java.util.concurrent.atomic.AtomicReference;
/**
* Wrapper for lazy loading and on-demand reloading of the vault configuration.
@@ -20,11 +18,11 @@ import java.util.Objects;
public class VaultConfigCache {
private final VaultSettings settings;
private final ObjectProperty<VaultConfig.UnverifiedVaultConfig> config;
private final AtomicReference<VaultConfig.UnverifiedVaultConfig> config;
VaultConfigCache(VaultSettings settings) {
this.settings = settings;
this.config = new SimpleObjectProperty<>();
this.config = new AtomicReference<>(null);
}
void reloadConfig() throws IOException {
@@ -37,7 +35,7 @@ public class VaultConfigCache {
}
public VaultConfig.UnverifiedVaultConfig get() throws IOException {
if (Objects.isNull(config.get())) {
if (config.get() == null) {
reloadConfig();
}
return config.get();