java: close ResultSet after use

Change-Id: I5b2903cf2928e19be203d80243c2ac2e75be28cb

1 files changed, 30 insertions, 25 deletions

diff --git a/connectivity/qa/complex/connectivity/hsqldb/DatabaseMetaData.java b/connectivity/qa/complex/connectivity/hsqldb/DatabaseMetaData.java
index 509e5df11b3a..457b037c74fb 100644
--- a/connectivity/qa/complex/connectivity/hsqldb/DatabaseMetaData.java
+++ b/connectivity/qa/complex/connectivity/hsqldb/DatabaseMetaData.java
@@ -53,6 +53,7 @@ public class DatabaseMetaData {
                 ResultSetMetaData rsMD = rs.getMetaData();
 
                 assure( sName + " returns wrong column count" , rsMD.getColumnCount() == nCount);
+                rs.close();
             }
             else
                 assure( sName + " returns wrong column count" , false);
@@ -67,33 +68,37 @@ public class DatabaseMetaData {
         }
     }
 
-    public void test(){
-
-            try{
-        ResultSet rs = m_xMD.getTables(null,null,"TESTCASE",null);
-        while ( rs.next() )
-        {
-            String catalog = rs.getString( 1 );
-            if ( rs.wasNull() )
-                catalog = null;
-
-            String schema = rs.getString( 2 );
-            if ( rs.wasNull() )
-                schema = null;
-
-            String table = rs.getString( 3 );
-            String type = rs.getString( 4 );
-            System.out.println("Catalog: " + catalog + " Schema: " + schema + " Table: " + table + " Type: " + type);
-            System.out.println("------------------ Columns ------------------");
-            ResultSet rsColumns = m_xMD.getColumns(catalog,schema,table,"%");
-            while ( rsColumns.next() )
-            {
-                System.out.println("Column: " + rsColumns.getString( 4 ) + " Type: " + rsColumns.getInt( 5 ) + " TypeName: " + rsColumns.getString( 6 ) );
-            }
+    public void test() {
 
-        }
-            } catch(Exception e){
+        try {
+            ResultSet rs = m_xMD.getTables(null, null, "TESTCASE", null);
+            while (rs.next()) {
+                String catalog = rs.getString(1);
+                if (rs.wasNull())
+                    catalog = null;
+
+                String schema = rs.getString(2);
+                if (rs.wasNull())
+                    schema = null;
+
+                String table = rs.getString(3);
+                String type = rs.getString(4);
+                System.out.println("Catalog: " + catalog + " Schema: " + schema
+                        + " Table: " + table + " Type: " + type);
+                System.out
+                        .println("------------------ Columns ------------------");
+                ResultSet rsColumns = m_xMD.getColumns(catalog, schema, table,
+                        "%");
+                while (rsColumns.next()) {
+                    System.out.println("Column: " + rsColumns.getString(4)
+                            + " Type: " + rsColumns.getInt(5) + " TypeName: "
+                            + rsColumns.getString(6));
+                }
 
             }
+            rs.close();
+        } catch (Exception e) {
+
+        }
     }
 }