[tomcat] branch 8.5.x updated: Avoid possible NPEs

[remm]

This is an automated email from the ASF dual-hosted git repository.

remm pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/8.5.x by this push:
     new 1a08b3eaae Avoid possible NPEs
1a08b3eaae is described below

commit 1a08b3eaae353431e3021497323b828a6000591f
Author: remm <r...@apache.org>
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 5db8525593..193a08f5c6 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 505f0e4142..9cf08123a1 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
@@ -230,7 +230,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: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org