Author: fhanik
Date: Thu Jun 2 15:26:21 2011
New Revision: 1130605
URL: http://svn.apache.org/viewvc?rev=1130605&view=rev
Log:
Correctly cast to the right PooledConnection
Modified:
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSource.java
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java
Modified:
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSource.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSource.java?rev=1130605&r1=1130604&r2=1130605&view=diff
==============================================================================
---
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSource.java
(original)
+++
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSource.java
Thu Jun 2 15:26:21 2011
@@ -36,7 +36,7 @@ import org.apache.juli.logging.LogFactor
* @author Filip Hanik
* @version 1.0
*/
-public class DataSource extends DataSourceProxy implements
javax.sql.DataSource,MBeanRegistration,
org.apache.tomcat.jdbc.pool.jmx.ConnectionPoolMBean {
+public class DataSource extends DataSourceProxy implements
javax.sql.DataSource,MBeanRegistration,
org.apache.tomcat.jdbc.pool.jmx.ConnectionPoolMBean,
javax.sql.ConnectionPoolDataSource {
private static final Log log = LogFactory.getLog(DataSource.class);
/**
@@ -53,6 +53,10 @@ public class DataSource extends DataSour
public DataSource(PoolConfiguration poolProperties) {
super(poolProperties);
}
+
+
+
+
//===============================================================================
// JMX Operations - Register the actual pool itself under the tomcat.jdbc
domain
Modified:
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java?rev=1130605&r1=1130604&r2=1130605&view=diff
==============================================================================
---
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java
(original)
+++
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java
Thu Jun 2 15:26:21 2011
@@ -165,16 +165,16 @@ public class DataSourceProxy implements
/**
* {@link javax.sql.DataSource#getConnection()}
*/
- public PooledConnection getPooledConnection() throws SQLException {
- return (PooledConnection) getConnection();
+ public javax.sql.PooledConnection getPooledConnection() throws
SQLException {
+ return (javax.sql.PooledConnection) getConnection();
}
/**
* {@link javax.sql.DataSource#getConnection()}
*/
- public PooledConnection getPooledConnection(String username,
+ public javax.sql.PooledConnection getPooledConnection(String username,
String password) throws
SQLException {
- return (PooledConnection) getConnection();
+ return (javax.sql.PooledConnection) getConnection();
}
public ConnectionPool getPool() {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
