Correctly cast to the right PooledConnection

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1130605 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSource.java b/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSource.java
index de837d8..f35df2f 100644 (file)
--- a/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSource.java
+++ b/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSource.java
@@ -36,7 +36,7 @@ import org.apache.juli.logging.LogFactory;
  * @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 DataSourceProxy implements javax.sql.DataSource,
     public DataSource(PoolConfiguration poolProperties) {
         super(poolProperties);
     }
+    
+    
+    
+    
 
 //===============================================================================
 //  JMX Operations - Register the actual pool itself under the tomcat.jdbc domain

diff --git a/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java b/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java
index 2280552..85f882c 100644 (file)
--- a/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java
+++ b/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java
@@ -165,16 +165,16 @@ public class DataSourceProxy implements PoolConfiguration {
     /**
      * {@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() {