[Sqlshell-svn] /devel/src/main/java/nl/improved/sqlclient/commands

[SVN by r. <sv...@ca...>]

Author: roy
Date: 2009-12-16 16:15:46 +0100 (Wed, 16 Dec 2009)
New Revision: 440

Modified:
   src/main/java/nl/improved/sqlclient/commands/DescCommand.java
Log:
close cursors


Modified: src/main/java/nl/improved/sqlclient/commands/DescCommand.java
===================================================================
--- src/main/java/nl/improved/sqlclient/commands/DescCommand.java	2009-12-16 11:32:47 UTC (rev 439)
+++ src/main/java/nl/improved/sqlclient/commands/DescCommand.java	2009-12-16 15:15:46 UTC (rev 440)
@@ -48,8 +48,9 @@
         ResultBuilder.setHorizontalSeparatorEnabled(false);
         ResultBuilder.setVerticalSeparator(' ');
         boolean foundMatch = false;
+        ResultSet rs = null;
         try {
-            ResultSet rs = conn.getMetaData().getColumns(conn.getCatalog(), DBConnector.getInstance().getSchema(), tableName, "%");
+            rs = conn.getMetaData().getColumns(conn.getCatalog(), DBConnector.getInstance().getSchema(), tableName, "%");
             int row = 0;
             while (rs.next()) {
                 foundMatch = true;
@@ -98,6 +99,9 @@
         } catch (SQLException ex) {
             throw new IllegalStateException("Failed to find columnnames for table: "+ tableName, ex);
         } finally {
+            if (rs != null) {
+                try { rs.close(); } catch(Exception e) { /*ignore */}
+            }
             ResultBuilder.setHorizontalSeparatorEnabled(oldEnabled);
             ResultBuilder.setVerticalSeparator(oldChar);
         }