Merge pull request #298 from hazendaz/master

[fix] Correct another leak and combine a try/resources block

src/main/java/org/apache/ibatis/migration/commands/BaseCommand.java

@@ -170,18 +170,19 @@ protected void copyExternalResourceTo(String resource, File toFile, Properties v
  }
 
  protected static void copyTemplate(File templateFile, File toFile, Properties variables) throws IOException {
- copyTemplate(new FileReader(templateFile), toFile, variables);
+ try (FileReader reader = new FileReader(templateFile)) {
+ copyTemplate(reader, toFile, variables);
+ }
  }
 
  protected static void copyTemplate(Reader templateReader, File toFile, Properties variables) throws IOException {
  VariableReplacer replacer = new VariableReplacer(variables);
- try (LineNumberReader reader = new LineNumberReader(templateReader)) {
- try (PrintWriter writer = new PrintWriter(new FileWriter(toFile))) {
- String line;
- while ((line = reader.readLine()) != null) {
- line = replacer.replace(line);
- writer.println(line);
- }
+ try (LineNumberReader reader = new LineNumberReader(templateReader);
+ PrintWriter writer = new PrintWriter(new FileWriter(toFile))) {
+ String line;
+ while ((line = reader.readLine()) != null) {
+ line = replacer.replace(line);
+ writer.println(line);
  }
  }
  }