github/ebean
4
0
Fork 0
mirror of https://github.com/ebean-orm/ebean.git synced 2026-10-23 23:28:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

#1412 - Fix Resource leaks for properties & yaml files etc - Loader

Browse Source
This commit is contained in:
Rob Bygrave
2018-06-10 23:31:16 +12:00
parent 3134dd3165
commit 54eaf561f4
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/io/ebean/config/properties/Loader.java
+11 -4
View File
@@ -118,7 +118,9 @@ class Loader {
void loadYaml(String resourcePath, Source source) {
if (yamlLoader != null) {
try {
yamlLoader.load(resource(resourcePath, source));
try (InputStream is = resource(resourcePath, source)) {
yamlLoader.load(is);
}
} catch (Exception e) {
log.warn("Failed to read yml from:" + resourcePath, e);
}
@@ -126,9 +128,14 @@ class Loader {
}
void loadProperties(String resourcePath, Source source) {
InputStream is = resource(resourcePath, source);
if (is != null) {
loadProperties(is);
try {
try (InputStream is = resource(resourcePath, source)) {
if (is != null) {
loadProperties(is);
}
}
} catch (Exception e) {
log.warn("Failed to read properties from:" + resourcePath, e);
}
}