Fixed some warnings

2 files changed, 14 insertions, 5 deletions

diff --git a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/DBUtil.java b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/DBUtil.java
index 0aa500536f..78f9af6420 100644
--- a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/DBUtil.java
+++ b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/DBUtil.java
@@ -237,6 +237,7 @@ public final class DBUtil
     {
       try
       {
+        @SuppressWarnings("resource")
         Statement statement = resultSet.getStatement();
         if (statement != null && statement.getMaxRows() != 0)
         {
diff --git a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/spi/db/DBAdapter.java b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/spi/db/DBAdapter.java
index 8e8f9a58f3..e72066b9c2 100644
--- a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/spi/db/DBAdapter.java
+++ b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/spi/db/DBAdapter.java
@@ -426,12 +426,20 @@ public abstract class DBAdapter implements IDBAdapter
         }
 
         ResultSet resultSet = statement.executeQuery(sql);
-        ResultSetMetaData metaData = resultSet.getMetaData();
-        int columnCount = metaData.getColumnCount();
-        if (columnCount != table.getFieldCount())
+
+        try
+        {
+          ResultSetMetaData metaData = resultSet.getMetaData();
+          int columnCount = metaData.getColumnCount();
+          if (columnCount != table.getFieldCount())
+          {
+            throw new DBException("DBTable " + table + " has " + columnCount + " columns instead of " //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                + table.getFieldCount());
+          }
+        }
+        finally
         {
-          throw new DBException("DBTable " + table + " has " + columnCount + " columns instead of " //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-              + table.getFieldCount());
+          DBUtil.close(resultSet);
         }
       }
       catch (SQLException ex)