handle nested exceptions in exception handlers (#1605)

sergiyvamz · web-flow · commit 7ec7b8ea5f44 · 2025-11-21T02:58:05.000Z
diff --git 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
@@ -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
@@ -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);
         }

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ public boolean isNetworkException(final Throwable throwable, @Nullable TargetDri`
`41`	`41`	`if (exception instanceof SQLException) {`
`42`	`42`	`return isNetworkException(((SQLException) exception).getSQLState());`
`43`	`43`	`} else if (targetDriverDialect != null) {`
`44`		`- String sqlState = targetDriverDialect.getSQLState(throwable);`
	`44`	`+ String sqlState = targetDriverDialect.getSQLState(exception);`
`45`	`45`	`if (!StringUtils.isNullOrEmpty(sqlState)) {`
`46`	`46`	`return isNetworkException(sqlState);`
`47`	`47`	`}`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ public boolean isNetworkException(final Throwable throwable, @Nullable TargetDri`
`53`	`53`	`return true;`
`54`	`54`	`}`
`55`	`55`	`} else if (targetDriverDialect != null) {`
`56`		`- String sqlState = targetDriverDialect.getSQLState(throwable);`
	`56`	`+ String sqlState = targetDriverDialect.getSQLState(exception);`
`57`	`57`	`if (!StringUtils.isNullOrEmpty(sqlState)) {`
`58`	`58`	`return isNetworkException(sqlState);`
`59`	`59`	`}`