(tomcat) branch 10.1.x updated: Always call ExceptionUtils.handleThrowable first in a catch block

[email protected] Mon, 20 Jul 2026 09:08:07 +0000
Newsgroups gmane.comp.jakarta.tomcat.devel
Message-ID <178453848770.3872990.2512522683825793519@gitbox3-he-fi.apache.org>
This is an automated email from the ASF dual-hosted git repository.

markt-asf pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/10.1.x by this push:
     new d50d08a788 Always call ExceptionUtils.handleThrowable first in a catch block
d50d08a788 is described below

commit d50d08a78829bb2cd59dc2ec6f280814399c36d3
Author: Mark Thomas <[email protected]>
AuthorDate: Mon Jul 20 10:07:49 2026 +0100

    Always call ExceptionUtils.handleThrowable first in a catch block
---
 java/org/apache/catalina/users/DataSourceUserDatabase.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/org/apache/catalina/users/DataSourceUserDatabase.java b/java/org/apache/catalina/users/DataSourceUserDatabase.java
index 1b2960eadb..9b3867b38f 100644
--- a/java/org/apache/catalina/users/DataSourceUserDatabase.java
+++ b/java/org/apache/catalina/users/DataSourceUserDatabase.java
@@ -1250,8 +1250,8 @@ public class DataSourceUserDatabase extends SparseUserDatabase {
                 dbConnection.commit();
                 success = true;
             } catch (Throwable t) {
-                log.error(sm.getString("dataSourceUserDatabase.exception"), t);
                 ExceptionUtils.handleThrowable(t);
+                log.error(sm.getString("dataSourceUserDatabase.exception"), t);
                 // Some exception occurred so rollback everything
                 try {
                     dbConnection.rollback();