From cdc48737b27fdf545107bd534c9a736462d7ed32 Mon Sep 17 00:00:00 2001
From: Lukas Eder <lukas.eder@gmail.com>
Date: Thu, 21 Nov 2019 14:01:44 +0100
Subject: [PATCH] [jOOQ/jOOQ#9584] Cosmetic fixes

---
 .../org/jooq/impl/DDLInterpreterMetaProvider.java  | 14 ++++++--------
 .../java/org/jooq/impl/DefaultMetaProvider.java    |  2 +-
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/jOOQ/src/main/java/org/jooq/impl/DDLInterpreterMetaProvider.java b/jOOQ/src/main/java/org/jooq/impl/DDLInterpreterMetaProvider.java
index 84e92fa510..c21cca6cb9 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DDLInterpreterMetaProvider.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DDLInterpreterMetaProvider.java
@@ -37,6 +37,8 @@
  */
 package org.jooq.impl;
 
+import static org.jooq.tools.jdbc.JDBCUtils.safeClose;
+
 import java.io.Reader;
 import java.util.Scanner;
 
@@ -95,9 +97,10 @@ final class DDLInterpreterMetaProvider implements MetaProvider {
     }
 
     private final void loadSource(DSLContext ctx, Source source, DDLInterpreter interpreter) {
-        Reader reader = source.reader();
+        Reader reader = null;
+
         try {
-            Scanner s = new Scanner(reader).useDelimiter("\\A");
+            Scanner s = new Scanner(reader = source.reader()).useDelimiter("\\A");
 
             for (Query query : ctx.parser().parse(s.hasNext() ? s.next() : ""))
                 interpreter.accept(query);
@@ -108,12 +111,7 @@ final class DDLInterpreterMetaProvider implements MetaProvider {
             throw e;
         }
         finally {
-            if (reader != null)
-                try {
-                    reader.close();
-                }
-                catch (Exception ignore) {}
+            safeClose(reader);
         }
     }
-
 }
diff --git a/jOOQ/src/main/java/org/jooq/impl/DefaultMetaProvider.java b/jOOQ/src/main/java/org/jooq/impl/DefaultMetaProvider.java
index 3d852d0c7e..51763a5eef 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DefaultMetaProvider.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DefaultMetaProvider.java
@@ -44,7 +44,7 @@ import org.jooq.Meta;
 import org.jooq.MetaProvider;
 
 /**
- * A default implementation of the {@link MetaProvider}, which provides meta
+ * A default implementation of the {@link MetaProvider} SPI, which provides meta
  * data information based on the JDBC {@link DatabaseMetaData} API.
  *
  * @author Lukas Eder