Remove unnecessary patch, the change was included upstream for asfbz#52493
This commit is contained in:
parent
27d871ef2c
commit
07b8ade141
@ -1,29 +0,0 @@
|
|||||||
--- 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}
|
|
||||||
*/
|
|
Loading…
Reference in New Issue
Block a user