From 4bc80cc724bac44ea36bf11fd09d1702c7a4687e Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Sun, 10 Jun 2018 23:36:12 +1200 Subject: [PATCH] #1412 - Fix Resource leaks for properties & yaml files etc - EbeanVersion --- src/main/java/io/ebean/EbeanVersion.java | 25 ++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/src/main/java/io/ebean/EbeanVersion.java b/src/main/java/io/ebean/EbeanVersion.java index caf1fc9eb..c9ca35b77 100644 --- a/src/main/java/io/ebean/EbeanVersion.java +++ b/src/main/java/io/ebean/EbeanVersion.java @@ -1,11 +1,11 @@ package io.ebean; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import java.io.IOException; import java.io.InputStream; import java.util.Properties; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * Class to determine the ebean version. ( * @author Roland Praml, FOCONIS AG @@ -13,31 +13,32 @@ import org.slf4j.LoggerFactory; */ public class EbeanVersion { private EbeanVersion() { - + } private static final Logger logger = LoggerFactory.getLogger(EbeanVersion.class); - + private static String version = "unknown"; static { try { Properties prop = new Properties(); - InputStream in = Ebean.class.getResourceAsStream("/META-INF/maven/io.ebean/ebean/pom.properties"); - if (in != null) { - prop.load(in); - in.close(); - version = prop.getProperty("version"); + try (InputStream in = Ebean.class.getResourceAsStream("/META-INF/maven/io.ebean/ebean/pom.properties")) { + if (in != null) { + prop.load(in); + in.close(); + version = prop.getProperty("version"); + } } logger.info("ebean version: {}", version); } catch (IOException e) { logger.warn("Could not determine ebean version: {}", e.getMessage()); } } - + /** * Returns the ebean version (read from /META-INF/maven/io.ebean/ebean/pom.properties) */ public static String getVersion() { return version; } - + }