ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

config manager: check for invalid keynames in loadFromFile

Browse Source 
Copy properties before advertising config changed events to prevent ConcurrentModificationException
This commit is contained in:
Adam
2018-03-22 12:54:44 -04:00
parent d049ad7bfb
commit 81553b61c4
1 changed files with 30 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
runelite-client/src/main/java/net/runelite/client/config/ConfigManager.java
View File

@@ -24,6 +24,7 @@
*/ */
package net.runelite.client.config; package net.runelite.client.config;
import com.google.common.collect.ImmutableMap;
import com.google.common.eventbus.EventBus; import com.google.common.eventbus.EventBus;
import java.awt.Color; import java.awt.Color;
import java.awt.Dimension; import java.awt.Dimension;
@@ -38,6 +39,7 @@ import java.lang.reflect.Proxy;
import java.util.Arrays; import java.util.Arrays;
import java.util.Comparator; import java.util.Comparator;
import java.util.List; import java.util.List;
import java.util.Map;
import java.util.Properties; import java.util.Properties;
import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ScheduledExecutorService;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@@ -173,19 +175,6 @@ public class ConfigManager
try (FileInputStream in = new FileInputStream(propertiesFile)) try (FileInputStream in = new FileInputStream(propertiesFile))
{ {
properties.load(in); properties.load(in);
properties.forEach((groupAndKey, value) ->
{
final String[] split = ((String)groupAndKey).split("\\.");
final String groupName = split[0];
final String key = split[1];
ConfigChanged configChanged = new ConfigChanged();
configChanged.setGroup(groupName);
configChanged.setKey(key);
configChanged.setOldValue(null);
configChanged.setNewValue((String) value);
eventBus.post(configChanged);
});
} }
catch (FileNotFoundException ex) catch (FileNotFoundException ex)
{ {
@@ -195,6 +184,34 @@ public class ConfigManager
{ {
log.warn("Unable to load settings", ex); log.warn("Unable to load settings", ex);
} }
try
{
Map<String, String> copy = (Map) ImmutableMap.copyOf(properties);
copy.forEach((groupAndKey, value) ->
{
final String[] split = ((String) groupAndKey).split("\\.");
if (split.length != 2)
{
log.debug("Properties key malformed!: {}", groupAndKey);
return;
}
final String groupName = split[0];
final String key = split[1];
ConfigChanged configChanged = new ConfigChanged();
configChanged.setGroup(groupName);
configChanged.setKey(key);
configChanged.setOldValue(null);
configChanged.setNewValue((String) value);
eventBus.post(configChanged);
});
}
catch (Exception ex)
{
log.warn("Error posting config events", ex);
}
} }
private void saveToFile() throws IOException private void saveToFile() throws IOException