github/jooq
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[jOOQ/jOOQ#12678] Potential resource leak in SettingsTools static initialiser

Browse Source
This commit is contained in:
Lukas Eder 2021-11-29 09:09:32 +01:00
parent 1e70ccfef9
commit 46f67918a0
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
jOOQ/src/main/java/org/jooq/conf/SettingsTools.java
View File

@ -46,6 +46,7 @@ import static org.jooq.conf.StatementType.STATIC_STATEMENT;
import static org.jooq.tools.StringUtils.defaultIfNull;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.sql.PreparedStatement;
import java.sql.Statement;
@ -76,8 +77,14 @@ public final class SettingsTools {
// Check classpath first
InputStream in = SettingsTools.class.getResourceAsStream(property);
if (in != null)
settings = MiniJAXB.unmarshal(in, Settings.class);
if (in != null) {
try (InputStream i = in) {
settings = MiniJAXB.unmarshal(i, Settings.class);
}
catch (IOException e) {
log.error("Error while reading settings: " + e);
}
}
else
settings = MiniJAXB.unmarshal(new File(property), Settings.class);
}
@ -86,8 +93,13 @@ public final class SettingsTools {
InputStream in = SettingsTools.class.getResourceAsStream("/jooq-settings.xml");
if (in != null) {
log.warn("DEPRECATION", "Loading system wide default settings via the classpath /jooq-settings.xml resource has been deprecated. Please use explicit Settings in your Configuration references, instead.");
settings = MiniJAXB.unmarshal(in, Settings.class);
try (InputStream i = in) {
log.warn("DEPRECATION", "Loading system wide default settings via the classpath /jooq-settings.xml resource has been deprecated. Please use explicit Settings in your Configuration references, instead.");
settings = MiniJAXB.unmarshal(i, Settings.class);
}
catch (IOException e) {
log.error("Error while reading settings: " + e);
}
}
}