clean up resources

JumpMind · Apr 18, 2012 · cf29e1a · cf29e1a
1 parent e46e9e7
commit cf29e1a
Showing 1 changed file with 23 additions and 15 deletions.
diff --git a/symmetric/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/AbstractJdbcDdlReader.java b/symmetric/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/AbstractJdbcDdlReader.java
@@ -52,6 +52,7 @@
 import org.jumpmind.db.sql.JdbcSqlTemplate;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.jdbc.support.JdbcUtils;
 
 /*
  * An utility class to create a Database model from a live database.
@@ -553,22 +554,29 @@ public Table readTable(final String catalog, final String schema, final String t
             public Table execute(Connection connection) throws SQLException {
                 Statement st = connection.createStatement();
                 ResultSet rs = st.executeQuery(sql);
-                ResultSetMetaData rsm = rs.getMetaData();
-                Table table = new Table();
-                table.setCatalog(catalog);
-                table.setSchema(schema);
-                table.setName(tableName);
-                for (int i = 1; i <= rsm.getColumnCount(); i++) {
-                    Column column = new Column(rsm.getColumnName(i));
-                    column.setJdbcTypeCode(rsm.getColumnType(i));
-                    column.setTypeCode(rsm.getColumnType(i));
-                    column.setRequired(rsm.isNullable(i) == 0);
-                    column.setScale(rsm.getScale(i));
-                    column.setPrecisionRadix(rsm.getPrecision(i));
-                    column.setAutoIncrement(rsm.isAutoIncrement(i));
-                    table.addColumn(column);
+                try {
+                    st = connection.createStatement();
+                    rs = st.executeQuery(sql);
+                    ResultSetMetaData rsm = rs.getMetaData();
+                    Table table = new Table();
+                    table.setCatalog(catalog);
+                    table.setSchema(schema);
+                    table.setName(tableName);
+                    for (int i = 1; i <= rsm.getColumnCount(); i++) {
+                        Column column = new Column(rsm.getColumnName(i));
+                        column.setJdbcTypeCode(rsm.getColumnType(i));
+                        column.setTypeCode(rsm.getColumnType(i));
+                        column.setRequired(rsm.isNullable(i) == 0);
+                        column.setScale(rsm.getScale(i));
+                        column.setPrecisionRadix(rsm.getPrecision(i));
+                        column.setAutoIncrement(rsm.isAutoIncrement(i));
+                        table.addColumn(column);
+                    }
+                    return table;
+                } finally {
+                    JdbcUtils.closeResultSet(rs);
+                    JdbcUtils.closeStatement(st);
                 }
-                return table;
             }
         }));
     }