[jboss-cvs] JBossAS SVN: r112473 - branches/JBPAPP_5_1_3_interim/connector/src/main/org/jboss/resource/adapter/jdbc/vendor.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Nov 23 16:11:10 EST 2011
Author: jbertram at redhat.com
Date: 2011-11-23 16:11:09 -0500 (Wed, 23 Nov 2011)
New Revision: 112473
Modified:
branches/JBPAPP_5_1_3_interim/connector/src/main/org/jboss/resource/adapter/jdbc/vendor/OracleValidConnectionChecker.java
Log:
JBPAPP-7543
Modified: branches/JBPAPP_5_1_3_interim/connector/src/main/org/jboss/resource/adapter/jdbc/vendor/OracleValidConnectionChecker.java
===================================================================
--- branches/JBPAPP_5_1_3_interim/connector/src/main/org/jboss/resource/adapter/jdbc/vendor/OracleValidConnectionChecker.java 2011-11-23 16:38:45 UTC (rev 112472)
+++ branches/JBPAPP_5_1_3_interim/connector/src/main/org/jboss/resource/adapter/jdbc/vendor/OracleValidConnectionChecker.java 2011-11-23 21:11:09 UTC (rev 112473)
@@ -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
More information about the jboss-cvs-commits
mailing list