From 0b8000eeaa519d11d0cdd8a3f0997c5f0b9b06fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Deleuze?= <sdeleuze@vmware.com>
Date: Tue, 22 Nov 2022 09:39:34 +0100
Subject: [PATCH] Refine LogAdapter#isPresent

Align LogAdapter#isPresent with ClassUtils#isPresent in order
to catch NoClassDefFoundError and other errors.

Closes gh-29506
---
 .../src/main/java/org/apache/commons/logging/LogAdapter.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/spring-jcl/src/main/java/org/apache/commons/logging/LogAdapter.java b/spring-jcl/src/main/java/org/apache/commons/logging/LogAdapter.java
index 1cb74b50177..74dbfbedca1 100644
--- a/spring-jcl/src/main/java/org/apache/commons/logging/LogAdapter.java
+++ b/spring-jcl/src/main/java/org/apache/commons/logging/LogAdapter.java
@@ -100,7 +100,8 @@ final class LogAdapter {
 			Class.forName(className, false, LogAdapter.class.getClassLoader());
 			return true;
 		}
-		catch (ClassNotFoundException ex) {
+		catch (Throwable ex) {
+			// Typically ClassNotFoundException or NoClassDefFoundError...
 			return false;
 		}
 	}