Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

other: fixed rare errors on images download opening, fixed wrong code in chats and preferences store;

Browse source
This commit is contained in:
Oleg Agafonov 2024-08-16 17:42:33 +04:00
parent 3d6a2817ae
commit e386210b91
4 changed files with 31 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

24
Mage.Client/src/main/java/mage/client/dialog/PreferencesDialog.java
View file

@ -32,6 +32,9 @@ import java.awt.image.BufferedImage;
import java.io.File;
import java.util.List;
import java.util.*;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReadWriteLock;
import java.util.concurrent.locks.ReentrantReadWriteLock;
import java.util.prefs.BackingStoreException;
import java.util.prefs.Preferences;
import java.util.stream.Collectors;
@ -327,6 +330,7 @@ public class PreferencesDialog extends javax.swing.JDialog {
// auto-update settings on first run
public static final String KEY_SETTINGS_VERSION = "settingsVersion";
private static final ReadWriteLock cacheLock = new ReentrantReadWriteLock();
private static final Map<String, String> CACHE = new HashMap<>();
public static final String OPEN_CONNECTION_TAB = "Open-Connection-Tab";
@ -3804,15 +3808,27 @@ public class PreferencesDialog extends javax.swing.JDialog {
}
public static String getCachedValue(String key, String def) {
if (CACHE.containsKey(key)) {
return CACHE.get(key);
} else {
final Lock r = cacheLock.readLock();
r.lock();
try {
if (CACHE.containsKey(key)) {
return CACHE.get(key);
}
} finally {
r.unlock();
}
final Lock w = cacheLock.writeLock();
w.lock();
try {
String value = MageFrame.getPreferences().get(key, def);
if (value == null) {
return def;
value = def;
}
CACHE.put(key, value);
return value;
} finally {
w.unlock();
}
}