[jboss-cvs] JBossAS SVN: r112561 - branches/JBPAPP_5_1/connector/src/main/org/jboss/resource/adapter/jdbc/vendor.

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

Author: jiwils
Date: 2012-01-09 01:29:31 -0500 (Mon, 09 Jan 2012)
New Revision: 112561

Modified:
   branches/JBPAPP_5_1/connector/src/main/org/jboss/resource/adapter/jdbc/vendor/OracleValidConnectionChecker.java
Log:
Merging 5.1.3_interim changes: JBPAPP-7543

Modified: branches/JBPAPP_5_1/connector/src/main/org/jboss/resource/adapter/jdbc/vendor/OracleValidConnectionChecker.java
===================================================================
--- branches/JBPAPP_5_1/connector/src/main/org/jboss/resource/adapter/jdbc/vendor/OracleValidConnectionChecker.java	2012-01-09 06:25:32 UTC (rev 112560)
+++ branches/JBPAPP_5_1/connector/src/main/org/jboss/resource/adapter/jdbc/vendor/OracleValidConnectionChecker.java	2012-01-09 06:29:31 UTC (rev 112561)
@@ -47,7 +47,7 @@
    private static transient Logger log;
 
    // The timeout in seconds (apparently the timeout is ignored?)
-   private static Object[] params = new Object[] { new Integer(5) };
+   private static Object[] params = new Object[] {};
 
    private transient Method ping;
 
@@ -67,16 +67,18 @@
    {
       try
       {
-         Integer status = (Integer) ping.invoke(c, params);
+         Integer status = (Integer) ping.invoke(c , params);
 
          // Error
          if (status == null || status.intValue() < 0)
-            return new SQLException("pingDatabase failed status=" + status);
+            return new SQLException("pingDatabase failed, status=" + status);
       }
       catch (Exception e)
       {
          // What do we do here? Assume it is a misconfiguration
-         log.warn("Unexpected error in pingDatabase", e);
+         log.warn("Unexpected error in pingDatabase, marking connection as invalid", e);
+         // To be conservative, we should throw an exception so the connection is invalidated - JBPAPP-7543
+         return new SQLException("pingDatabase failed, exception=" + e);
       }
 
       // OK
@@ -88,7 +90,7 @@
       log = Logger.getLogger(OracleValidConnectionChecker.class);
 
       Class oracleConnection = Thread.currentThread().getContextClassLoader().loadClass("oracle.jdbc.driver.OracleConnection");
-      ping = oracleConnection.getMethod("pingDatabase", new Class[] { Integer.TYPE });
+      ping = oracleConnection.getMethod("pingDatabase", new Class[] {});
    }
 
    private void writeObject(ObjectOutputStream stream) throws IOException