svn commit: r817542 - /servicemix/smx4/bundles/trunk/commons-dbcp-1.2.2/src/main/java/org/apache/commons/dbcp/BasicDataSource.java

[lh...@apache.org]

Author: lhein
Date: Tue Sep 22 08:35:10 2009
New Revision: 817542

URL: http://svn.apache.org/viewvc?rev=817542&view=rev
Log:
fixed missing methods for Java6 (Wrapper interface)

Modified:
    servicemix/smx4/bundles/trunk/commons-dbcp-1.2.2/src/main/java/org/apache/commons/dbcp/BasicDataSource.java

Modified: servicemix/smx4/bundles/trunk/commons-dbcp-1.2.2/src/main/java/org/apache/commons/dbcp/BasicDataSource.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/commons-dbcp-1.2.2/src/main/java/org/apache/commons/dbcp/BasicDataSource.java?rev=817542&r1=817541&r2=817542&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/commons-dbcp-1.2.2/src/main/java/org/apache/commons/dbcp/BasicDataSource.java (original)
+++ servicemix/smx4/bundles/trunk/commons-dbcp-1.2.2/src/main/java/org/apache/commons/dbcp/BasicDataSource.java Tue Sep 22 08:35:10 2009
@@ -18,11 +18,12 @@
 package org.apache.commons.dbcp;
 
 import java.io.PrintWriter;
-import java.util.Properties;
 import java.sql.Connection;
 import java.sql.Driver;
 import java.sql.DriverManager;
 import java.sql.SQLException;
+import java.util.Properties;
+
 import javax.sql.DataSource;
 
 import org.apache.commons.pool.impl.GenericKeyedObjectPool;
@@ -1241,7 +1242,7 @@
         dataSource = new PoolingDataSource(connectionPool);
         ((PoolingDataSource) dataSource).setAccessToUnderlyingConnectionAllowed(isAccessToUnderlyingConnectionAllowed());
         dataSource.setLogWriter(logWriter);
-        
+
         try {
             for (int i = 0 ; i < initialSize ; i++) {
                 connectionPool.addObject();
@@ -1282,4 +1283,18 @@
             logWriter.println(message);
         }
     }
+
+    /* (non-Javadoc)
+     * @see java.sql.Wrapper#isWrapperFor(java.lang.Class)
+     */
+    public boolean isWrapperFor(Class iface) throws SQLException {
+    	return false;
+    }
+    
+    /* (non-Javadoc)
+     * @see java.sql.Wrapper#unwrap(java.lang.Class)
+     */
+    public Object unwrap(Class iface) throws SQLException {
+    	throw new SQLException("BasicDataSource is not a wrapper.");
+    }
 }