missing null check of e.getCause(). (#2300)

if the caught exception does not have a cause then pass the caught exception as the cause to the SQLTimeoutException instead of the null "e.getCause()". (#2299) Co-authored-by: jesperah <jesperah@rob-ex.com>
microsoft · Jan 15, 2024 · 0f04ce6 · 0f04ce6
1 parent a6004e9
commit 0f04ce6
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerStatement.java b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerStatement.java
@@ -262,10 +262,14 @@ final void executeStatement(TDSCommand newStmtCmd) throws SQLServerException, SQ
             // (Re)execute this Statement with the new command
             executeCommand(newStmtCmd);
         } catch (SQLServerException e) {
-            if (e.getDriverErrorCode() == SQLServerException.ERROR_QUERY_TIMEOUT)
+            if (e.getDriverErrorCode() == SQLServerException.ERROR_QUERY_TIMEOUT) {
+                if (e.getCause() == null) {
+                    throw new SQLTimeoutException(e.getMessage(), e.getSQLState(), e.getErrorCode(), e);
+                }
                 throw new SQLTimeoutException(e.getMessage(), e.getSQLState(), e.getErrorCode(), e.getCause());
-            else
+            } else {
                 throw e;
+            }
         } finally {
             if (newStmtCmd.wasExecuted())
                 lastStmtExecCmd = newStmtCmd;