From 94792734708ca2a55a08370d905f531e952996ec Mon Sep 17 00:00:00 2001 From: Mikhail Mazurskiy Date: Wed, 15 Apr 2015 20:06:33 +1000 Subject: [PATCH] Use path API --- src/main/java/com/zaxxer/hikari/HikariConfig.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/zaxxer/hikari/HikariConfig.java b/src/main/java/com/zaxxer/hikari/HikariConfig.java index c6affab1..7acbb39d 100644 --- a/src/main/java/com/zaxxer/hikari/HikariConfig.java +++ b/src/main/java/com/zaxxer/hikari/HikariConfig.java @@ -16,12 +16,13 @@ package com.zaxxer.hikari; -import java.io.File; -import java.io.FileInputStream; import java.io.IOException; import java.io.InputStream; import java.lang.reflect.Field; import java.lang.reflect.Modifier; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; import java.util.Properties; import java.util.Set; import java.util.TreeSet; @@ -800,8 +801,8 @@ public class HikariConfig implements HikariConfigMBean protected void loadProperties(String propertyFileName) { - final File propFile = new File(propertyFileName); - try (final InputStream is = propFile.isFile() ? new FileInputStream(propFile) : this.getClass().getResourceAsStream(propertyFileName)) { + final Path propFile = Paths.get(propertyFileName); + try (final InputStream is = Files.isRegularFile(propFile) ? Files.newInputStream(propFile) : this.getClass().getResourceAsStream(propertyFileName)) { if (is != null) { Properties props = new Properties(); props.load(is);