XmlBeansLogManager handle null logger case

git-svn-id: https://svn.apache.org/repos/asf/xmlbeans/trunk@1921989 13f79535-47bb-0310-9956-ffa450edef68
apache · Nov 21, 2024 · 31f92ec · 31f92ec
1 parent 5eacf3e
commit 31f92ec
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/src/main/java/org/apache/xmlbeans/impl/logging/XmlBeansLogManager.java b/src/main/java/org/apache/xmlbeans/impl/logging/XmlBeansLogManager.java
@@ -36,11 +36,19 @@ private XmlBeansLogManager() {
     }
 
     public static Logger getLogger(Class<?> clz) {
+        final long time = System.currentTimeMillis();
         try {
-            return LogManager.getLogger(clz);
+            final Logger logger = LogManager.getLogger(clz);
+            if (logger == null) {
+                if (time > LAST_TIME + SLEEP_TIME) {
+                    LAST_TIME = time;
+                    System.err.println("Log4J returned null logger. Falling back to No-Op logger.");
+                }
+                return NoOpLogger.INSTANCE;
+            }
+            return logger;
         } catch (Throwable t) {
             if (!ExceptionUtil.isFatal(t)) {
-                final long time = System.currentTimeMillis();
                 if (time > LAST_TIME + SLEEP_TIME) {
                     LAST_TIME = time;
                     System.err.println("Issue loading Log4J. Falling back to No-Op logger.");