[Jboss-cvs] JBossAS SVN: r57093 - trunk/connector/src/main/org/jboss/resource/adapter/jdbc/vendor

[jboss-cvs-commits at lists.jboss.org]

Author: weston.price at jboss.com
Date: 2006-09-22 22:25:20 -0400 (Fri, 22 Sep 2006)
New Revision: 57093

Modified:
   trunk/connector/src/main/org/jboss/resource/adapter/jdbc/vendor/SybaseValidConnectionChecker.java
Log:
[JBAS-3339] Implementation of ValidConnection checker for Sybase. 

Modified: trunk/connector/src/main/org/jboss/resource/adapter/jdbc/vendor/SybaseValidConnectionChecker.java
===================================================================
--- trunk/connector/src/main/org/jboss/resource/adapter/jdbc/vendor/SybaseValidConnectionChecker.java	2006-09-23 02:17:20 UTC (rev 57092)
+++ trunk/connector/src/main/org/jboss/resource/adapter/jdbc/vendor/SybaseValidConnectionChecker.java	2006-09-23 02:25:20 UTC (rev 57093)
@@ -2,7 +2,9 @@
 
 import java.io.Serializable;
 import java.sql.Connection;
+import java.sql.ResultSet;
 import java.sql.SQLException;
+import java.sql.Statement;
 
 import org.jboss.logging.Logger;
 import org.jboss.resource.adapter.jdbc.ValidConnectionChecker;
@@ -15,6 +17,7 @@
  */
 public class SybaseValidConnectionChecker implements ValidConnectionChecker, Serializable
 {
+   private static final Logger log = Logger.getLogger(SybaseValidConnectionChecker.class);
    
    /** The serialVersionUID */
    private static final long serialVersionUID = 4179707462244257791L;
@@ -26,23 +29,51 @@
    public SQLException isValidConnection(Connection c)
    {
       SQLException sqe = null;
+      Statement s = null;
+      ResultSet rs = null;
       
-      if(c != null)
-      {
-         
          try
          {
-            c.createStatement().execute(VALID_QUERY);
-         }
-         
-         catch (SQLException e)
+            s = c.createStatement();
+            rs = s.executeQuery(VALID_QUERY);
+            
+         }catch (SQLException e)
          {
                    
             sqe = e;
             
+         }finally
+         {
+            
+            try
+            {
+               if(s != null)
+               {
+                  s.close();
+                  
+               }
+            }
+            
+            catch (SQLException ignore)
+            {
+               log.warn("JDBC resource for " + this + " could not be closed");
+               
+            }
+         
+            try
+            {
+               if(rs != null)
+               {
+                  rs.close();
+               }
+            }
+            
+            catch (SQLException ignore)
+            {
+               log.warn("JDBC resource for " + this + " could not be closed");
+            }
          }
                   
-      }
       
       return sqe;
    }