CONJ-864 - includeThreadDumpInDeadlockExceptions always includes the …

…thread dump, even when it is not a deadlock exception
mariadb-corporation · May 12, 2021 · 1acaffc · 1acaffc
1 parent c4c3b81
commit 1acaffc
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/main/java/org/mariadb/jdbc/internal/util/exceptions/ExceptionFactory.java b/src/main/java/org/mariadb/jdbc/internal/util/exceptions/ExceptionFactory.java
@@ -121,7 +121,9 @@ private static String buildMsgText(
       msg.append("\ndeadlock information: ").append(deadLockException);
     }
 
-    if (options != null && options.includeThreadDumpInDeadlockExceptions) {
+    if (options != null
+            && deadLockException != null
+            && options.includeThreadDumpInDeadlockExceptions) {
       if (threadName != null) {
         msg.append("\nthread name: ").append(threadName);
       }