This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new bee52614f3 Avoid possible NPEs
bee52614f3 is described below
commit bee52614f3d694b169c2682b539d98ced93eb1a8
Author: remm <[email protected]>
AuthorDate: Mon Sep 25 14:42:36 2023 +0200
Avoid possible NPEs
---
.../src/main/java/org/apache/tomcat/jdbc/pool/ProxyConnection.java | 2 +-
.../org/apache/tomcat/jdbc/pool/interceptor/StatementCache.java | 6 +++++-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git
a/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ProxyConnection.java
b/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ProxyConnection.java
index d91cc0861f..04fc32fc35 100644
---
a/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ProxyConnection.java
+++
b/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ProxyConnection.java
@@ -106,7 +106,7 @@ public class ProxyConnection extends JdbcInterceptor {
return this.toString();
} else if (compare(GETCONNECTION_VAL,method) && connection!=null) {
return connection.getConnection();
- } else if
(method.getDeclaringClass().isAssignableFrom(XAConnection.class)) {
+ } else if
(method.getDeclaringClass().isAssignableFrom(XAConnection.class) && connection
!= null) {
try {
return method.invoke(connection.getXAConnection(),args);
}catch (Throwable t) {
diff --git
a/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/StatementCache.java
b/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/StatementCache.java
index 9ce39c089f..8b74b64bcc 100644
---
a/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/StatementCache.java
+++
b/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/StatementCache.java
@@ -218,7 +218,11 @@ public class StatementCache extends
StatementDecoratorInterceptor implements Sta
if (cache == null) {
return null;
}
- return cache.get(createCacheKey(method, args));
+ CacheKey key = createCacheKey(method, args);
+ if (key == null) {
+ throw new IllegalArgumentException("Null key");
+ }
+ return cache.get(key);
}
public boolean cacheStatement(CachedStatement proxy) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
