MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup (unneeded nested 'try'; warnings)

Browse Source
This commit is contained in:
Roman Shevchenko
2019-04-02 21:55:39 +02:00
parent 037999b75b
commit 90ba281939
1 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/util/src/com/intellij/openapi/application/PathManager.java
+9 -11
View File
@@ -419,17 +419,15 @@ public class PathManager {
Properties sysProperties = System.getProperties();
for (String path : paths) {
if (path != null && new File(path).exists()) {
try {
try (Reader fis = new BufferedReader(new FileReader(path))) {
Map<String, String> properties = FileUtil.loadProperties(fis);
for (Map.Entry<String, String> entry : properties.entrySet()) {
String key = entry.getKey();
if (PROPERTY_HOME_PATH.equals(key) || PROPERTY_HOME.equals(key)) {
log(path + ": '" + key + "' cannot be redefined");
}
else if (!sysProperties.containsKey(key)) {
sysProperties.setProperty(key, substituteVars(entry.getValue()));
}
try (@SuppressWarnings("ImplicitDefaultCharsetUsage") Reader reader = new FileReader(path)) {
Map<String, String> properties = FileUtil.loadProperties(reader);
for (Map.Entry<String, String> entry : properties.entrySet()) {
String key = entry.getKey();
if (PROPERTY_HOME_PATH.equals(key) || PROPERTY_HOME.equals(key)) {
log(path + ": '" + key + "' cannot be redefined");
}
else if (!sysProperties.containsKey(key)) {
sysProperties.setProperty(key, substituteVars(entry.getValue()));
}
}
}