This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 1d91f94d2acd57ac5af3fb5ebc041b6871c54096
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Oct 1 15:48:52 2019 +0100
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63778
Use correct signature to look up DatabaseMetaData.getPseudoColumns()
---
java/org/apache/tomcat/util/compat/Jre7Compat.java | 2 +-
webapps/docs/changelog.xml | 7 +++++++
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/tomcat/util/compat/Jre7Compat.java
b/java/org/apache/tomcat/util/compat/Jre7Compat.java
index 40f4a50..43513a9 100644
--- a/java/org/apache/tomcat/util/compat/Jre7Compat.java
+++ b/java/org/apache/tomcat/util/compat/Jre7Compat.java
@@ -85,7 +85,7 @@ class Jre7Compat extends JreCompat {
m6 = Connection.class.getMethod("abort", Executor.class);
m7 = Connection.class.getMethod("setNetworkTimeout",
Executor.class, int.class);
m8 = Connection.class.getMethod("getNetworkTimeout");
- m9 = DatabaseMetaData.class.getMethod("getPseudoColumns");
+ m9 = DatabaseMetaData.class.getMethod("getPseudoColumns",
String.class, String.class, String.class, String.class);
m10 =
DatabaseMetaData.class.getMethod("generatedKeyAlwaysReturned");
m11 = ResultSet.class.getMethod("getObject", int.class,
Class.class);
m12 = ResultSet.class.getMethod("getObject", String.class,
Class.class);
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index bc95a19..c4e3fcd 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -113,6 +113,13 @@
<bug>63758</bug>: Include the XML schema for the tomcat-users.xml file
in the binary distributions. (markt)
</fix>
+ <fix>
+ <bug>63778</bug>: When running on Java 7, use the correct signature to
+ look up the <code>DatabaseMetaData.getPseudoColumns()</code> method and
+ avoid the <code>NullPointerException</code>s caused by using the wrong
+ method. Add error logging to detect similar bugs. Based on a pull
+ request by liguoxiong. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
