From bd8343456b3efd1c251e90df7ce3aa2ced757229 Mon Sep 17 00:00:00 2001 From: sergiyvamz Date: Thu, 20 Nov 2025 12:53:17 -0800 Subject: [PATCH] handle nested exceptions in exception handlers --- .../amazon/jdbc/exceptions/AbstractPgExceptionHandler.java | 2 +- .../amazon/jdbc/exceptions/GenericExceptionHandler.java | 4 ++-- .../amazon/jdbc/exceptions/MySQLExceptionHandler.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/wrapper/src/main/java/software/amazon/jdbc/exceptions/AbstractPgExceptionHandler.java b/wrapper/src/main/java/software/amazon/jdbc/exceptions/AbstractPgExceptionHandler.java index 0d071bc7e..22e9cf1be 100644 --- a/wrapper/src/main/java/software/amazon/jdbc/exceptions/AbstractPgExceptionHandler.java +++ b/wrapper/src/main/java/software/amazon/jdbc/exceptions/AbstractPgExceptionHandler.java @@ -41,7 +41,7 @@ public boolean isNetworkException(final Throwable throwable, @Nullable TargetDri if (exception instanceof SQLException) { return isNetworkException(((SQLException) exception).getSQLState()); } else if (targetDriverDialect != null) { - String sqlState = targetDriverDialect.getSQLState(throwable); + String sqlState = targetDriverDialect.getSQLState(exception); if (!StringUtils.isNullOrEmpty(sqlState)) { return isNetworkException(sqlState); } diff --git a/wrapper/src/main/java/software/amazon/jdbc/exceptions/GenericExceptionHandler.java b/wrapper/src/main/java/software/amazon/jdbc/exceptions/GenericExceptionHandler.java index 79e811323..cc34175db 100644 --- a/wrapper/src/main/java/software/amazon/jdbc/exceptions/GenericExceptionHandler.java +++ b/wrapper/src/main/java/software/amazon/jdbc/exceptions/GenericExceptionHandler.java @@ -52,7 +52,7 @@ public boolean isNetworkException(final Throwable throwable, @Nullable TargetDri if (exception instanceof SQLException) { return isNetworkException(((SQLException) exception).getSQLState()); } else if (targetDriverDialect != null) { - String sqlState = targetDriverDialect.getSQLState(throwable); + String sqlState = targetDriverDialect.getSQLState(exception); if (!StringUtils.isNullOrEmpty(sqlState)) { return isNetworkException(sqlState); } @@ -98,7 +98,7 @@ public boolean isLoginException(final Throwable throwable, TargetDriverDialect t if (exception instanceof SQLException) { sqlState = ((SQLException) exception).getSQLState(); } else if (targetDriverDialect != null) { - sqlState = targetDriverDialect.getSQLState(throwable); + sqlState = targetDriverDialect.getSQLState(exception); } if (isLoginException(sqlState)) { diff --git a/wrapper/src/main/java/software/amazon/jdbc/exceptions/MySQLExceptionHandler.java b/wrapper/src/main/java/software/amazon/jdbc/exceptions/MySQLExceptionHandler.java index f1f628a56..a504f5074 100644 --- a/wrapper/src/main/java/software/amazon/jdbc/exceptions/MySQLExceptionHandler.java +++ b/wrapper/src/main/java/software/amazon/jdbc/exceptions/MySQLExceptionHandler.java @@ -53,7 +53,7 @@ public boolean isNetworkException(final Throwable throwable, @Nullable TargetDri return true; } } else if (targetDriverDialect != null) { - String sqlState = targetDriverDialect.getSQLState(throwable); + String sqlState = targetDriverDialect.getSQLState(exception); if (!StringUtils.isNullOrEmpty(sqlState)) { return isNetworkException(sqlState); }