Maybe working now?

JabRef · Dec 6, 2015 · 1f6b67b · 1f6b67b
1 parent 17372ba
commit 1f6b67b
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 10 deletions.
diff --git a/src/main/java/net/sf/jabref/sql/DbConnectAction.java b/src/main/java/net/sf/jabref/sql/DbConnectAction.java
@@ -71,7 +71,7 @@ public void action() {
         PositionWindow.placeDialog(dbd, panel);
         dbd.setVisible(true);
 
-        // connnect to database to test DBStrings
+        // connect to database to test DBStrings
         if (dbd.getConnectToDB()) {
 
             dbs = dbd.getDBStrings();
@@ -82,8 +82,9 @@ public void action() {
                         Localization.lang("Establishing SQL connection..."));
                 DBExporter exporter = (new DBExporterAndImporterFactory())
                         .getExporter(dbs.getServerType());
-                Connection conn = exporter.connectToDB(dbs);
-                conn.close();
+                try (Connection conn = exporter.connectToDB(dbs)) {
+                    // Nothing
+                }
                 dbs.isConfigValid(true);
                 panel.frame().output(
                         Localization.lang("SQL connection established."));

diff --git a/src/main/java/net/sf/jabref/sql/SQLUtil.java b/src/main/java/net/sf/jabref/sql/SQLUtil.java
@@ -186,9 +186,8 @@ public static String getExceptionMessage(Exception ex) {
      */
     public static ResultSet queryAllFromTable(Connection conn, String tableName) throws SQLException {
         String query = "SELECT * FROM " + tableName + ';';
-        try (Statement res = (Statement) SQLUtil.processQueryWithResults(conn, query)) {
-            return res.getResultSet();
-        }
+        Statement res = (Statement) SQLUtil.processQueryWithResults(conn, query);
+        return res.getResultSet();
     }
 
     /**

diff --git a/src/main/java/net/sf/jabref/sql/importer/PostgreSQLImporter.java b/src/main/java/net/sf/jabref/sql/importer/PostgreSQLImporter.java
@@ -53,10 +53,9 @@ public static PostgreSQLImporter getInstance() {
 
     @Override
     protected ResultSet readColumnNames(Connection conn) throws SQLException {
-        try (Statement statement = (Statement) SQLUtil.processQueryWithResults(conn,
-                "SELECT column_name FROM information_schema.columns WHERE table_name ='entries';")) {
-            return statement.getResultSet();
-        }
+        Statement statement = (Statement) SQLUtil.processQueryWithResults(conn,
+                "SELECT column_name FROM information_schema.columns WHERE table_name ='entries';");
+        return statement.getResultSet();
     }
 
     @Override