fix LOGBACK-1623

Signed-off-by: Ceki Gulcu <ceki@qos.ch>
qos-ch · Mar 31, 2022 · d0f8431 · d0f8431 · vikinghawk · Jul 22, 2022
1 parent 4eb2914
commit d0f8431
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/logback-classic/src/main/java/ch/qos/logback/classic/spi/ThrowableProxy.java b/logback-classic/src/main/java/ch/qos/logback/classic/spi/ThrowableProxy.java
@@ -14,6 +14,7 @@
 package ch.qos.logback.classic.spi;
 
 import ch.qos.logback.core.CoreConstants;
+import ch.qos.logback.core.util.OptionHelper;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
@@ -93,10 +94,10 @@ public ThrowableProxy(Throwable throwable, Set<Throwable> alreadyProcessedSet) {
 		}
 
 		if (GET_SUPPRESSED_METHOD != null) {
-			// this will only execute on Java 7
+			// this will only execute on Java 7 and later
 			Throwable[] throwableSuppressed = extractSupressedThrowables(throwable);
 
-			if (throwableSuppressed.length > 0) {
+			if (OptionHelper.isNotEmtpy(throwableSuppressed)) {
 				List<ThrowableProxy> suppressedList = new ArrayList<ThrowableProxy>(throwableSuppressed.length);
 				for (Throwable sup : throwableSuppressed) {
 					if (alreadyProcessedSet.contains(sup)) {

diff --git a/logback-core/src/main/java/ch/qos/logback/core/util/OptionHelper.java b/logback-core/src/main/java/ch/qos/logback/core/util/OptionHelper.java
@@ -259,5 +259,15 @@ public static boolean toBoolean(String value, boolean dEfault) {
     public static boolean isEmpty(String str) {
         return ((str == null) || str.length() == 0);
     }
+
+    final public static boolean isNullOrEmpty(Object[] array) {
+		if(array == null || array.length == 0)
+			return true;
+		else
+			return false;
+	}
 
+	final public static boolean isNotEmtpy(Object[] array) {
+	   return !isNullOrEmpty(array);
+	}
 }