From b4cf88499c36c5120da9596e2785895a3d2a512d Mon Sep 17 00:00:00 2001 From: Hyunjin Choi Date: Tue, 4 Feb 2020 22:21:59 +0900 Subject: [PATCH] Use try-with-resource in ScriptUtils Closes gh-24385 --- .../springframework/jdbc/datasource/init/ScriptUtils.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/init/ScriptUtils.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/init/ScriptUtils.java index 6ee6be6e1bb..2b2f66b57f6 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/init/ScriptUtils.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/init/ScriptUtils.java @@ -325,13 +325,9 @@ public abstract class ScriptUtils { private static String readScript(EncodedResource resource, @Nullable String[] commentPrefixes, @Nullable String separator, @Nullable String blockCommentEndDelimiter) throws IOException { - LineNumberReader lnr = new LineNumberReader(resource.getReader()); - try { + try (LineNumberReader lnr = new LineNumberReader(resource.getReader())) { return readScript(lnr, commentPrefixes, separator, blockCommentEndDelimiter); } - finally { - lnr.close(); - } } /**