a7d085a852
- Removed EntityResolver patch (changes already in upstream sources) - Place poms and depmaps in the same package as jars - Added javax.servlet.descriptor to export-package of servlet-api - Move several chkconfig actions and reqs to systemv subpackage - New maven depmaps generation method - Add patch to support java7. (patch sent upstream). - Require java >= 1:1.6.0
30 lines
977 B
Diff
30 lines
977 B
Diff
--- modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java.sav 2012-01-17 13:55:44.000000000 +0400
|
|
+++ modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java 2012-01-22 00:44:22.299789107 +0400
|
|
@@ -19,9 +19,11 @@ package org.apache.tomcat.jdbc.pool;
|
|
import java.io.PrintWriter;
|
|
import java.sql.Connection;
|
|
import java.sql.SQLException;
|
|
+import java.sql.SQLFeatureNotSupportedException;
|
|
import java.util.Iterator;
|
|
import java.util.Properties;
|
|
import java.util.concurrent.Future;
|
|
+import java.util.logging.Logger;
|
|
|
|
import javax.sql.XAConnection;
|
|
|
|
@@ -534,6 +536,14 @@ public class DataSourceProxy implements
|
|
}
|
|
|
|
/**
|
|
+ * no-op
|
|
+ * {@link javax.sql.DataSource#getParentLogger}
|
|
+ */
|
|
+ public Logger getParentLogger() throws SQLFeatureNotSupportedException {
|
|
+ throw new SQLFeatureNotSupportedException();
|
|
+ }
|
|
+
|
|
+ /**
|
|
* no-op
|
|
* {@link javax.sql.DataSource#getLogWriter}
|
|
*/
|