Merge pull request #10 from swaldman/master

Added a constructor for HikariConfig that accepts a Properties object. M...

core/src/main/java/com/zaxxer/hikari/HikariConfig.java

@@ -81,6 +81,18 @@ public HikariConfig()
         poolName = "HikariPool-" + poolNumber++;
     }
 
+    /**
+     * Construct a HikariConfig from the specified properties object.
+     *
+     * @param properties the name of the property file
+     */
+    public HikariConfig(Properties properties)
+    {
+        this();
+	PropertyBeanSetter.setTargetFromProperties(this, properties);
+    }
+
+
     /**
      * Construct a HikariConfig from the specified property file name.
      *
@@ -96,9 +108,8 @@ public HikariConfig(String propertyFileName)
             throw new IllegalArgumentException("Property file " + propertyFileName + " was not found.");
         }
 
-        try
+        try ( FileInputStream fis = new FileInputStream(propFile) )
         {
-            FileInputStream fis = new FileInputStream(propFile);
             Properties props = new Properties();
             props.load(fis);
             PropertyBeanSetter.setTargetFromProperties(this, props);