From a2972abe3e2b530f796bc56e69b556658a7adcbd Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Sun, 10 Jun 2018 23:33:21 +1200 Subject: [PATCH] #1412 - Fix Resource leaks for properties & yaml files etc - DdlGenerator --- .../ebeaninternal/dbmigration/DdlGenerator.java | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/main/java/io/ebeaninternal/dbmigration/DdlGenerator.java b/src/main/java/io/ebeaninternal/dbmigration/DdlGenerator.java index 68455dd89..40614c8b8 100644 --- a/src/main/java/io/ebeaninternal/dbmigration/DdlGenerator.java +++ b/src/main/java/io/ebeaninternal/dbmigration/DdlGenerator.java @@ -2,10 +2,10 @@ package io.ebeaninternal.dbmigration; import io.ebean.Transaction; import io.ebean.config.ServerConfig; -import io.ebeaninternal.dbmigration.model.CurrentModel; -import io.ebeaninternal.api.SpiEbeanServer; -import io.ebeaninternal.extraddl.model.ExtraDdlXmlReader; import io.ebean.migration.ddl.DdlRunner; +import io.ebeaninternal.api.SpiEbeanServer; +import io.ebeaninternal.dbmigration.model.CurrentModel; +import io.ebeaninternal.extraddl.model.ExtraDdlXmlReader; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -173,10 +173,11 @@ public class DdlGenerator { protected void runResourceScript(String sqlScript) throws IOException { if (sqlScript != null) { - InputStream is = getClassLoader().getResourceAsStream(sqlScript); - if (is != null) { - String content = readContent(new InputStreamReader(is)); - runScript(false, content, sqlScript); + try (InputStream is = getClassLoader().getResourceAsStream(sqlScript)) { + if (is != null) { + String content = readContent(new InputStreamReader(is)); + runScript(false, content, sqlScript); + } } } }