add NoAutoStartUtil.shouldBeStarted method

Signed-off-by: Ceki Gulcu <ceki@qos.ch>
qos-ch · Mar 2, 2024 · 6998e81 · 6998e81
1 parent 40bc1c2
commit 6998e81
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 5 deletions.
diff --git a/logback-core/src/main/java/ch/qos/logback/core/joran/spi/NoAutoStartUtil.java b/logback-core/src/main/java/ch/qos/logback/core/joran/spi/NoAutoStartUtil.java
@@ -13,6 +13,8 @@
  */
 package ch.qos.logback.core.joran.spi;
 
+import ch.qos.logback.core.spi.LifeCycle;
+
 public class NoAutoStartUtil {
 
     /**
@@ -23,12 +25,23 @@ public class NoAutoStartUtil {
      * @return true for classes not marked with the NoAutoStart annotation
      */
     static public boolean notMarkedWithNoAutoStart(Object o) {
-        if (o == null) {
-            return false;
-        }
         Class<?> clazz = o.getClass();
         NoAutoStart a = clazz.getAnnotation(NoAutoStart.class);
         return a == null;
     }
 
+    /**
+     * Is the object a {@link LifeCycle} and is it marked not marked with
+     * the NoAutoStart annotation.
+     * @param o
+     * @return
+     * @ since 1.5.2
+     */
+    static public boolean shouldBeStarted(Object o) {
+        if(o instanceof LifeCycle) {
+            return notMarkedWithNoAutoStart(o);
+        } else
+            return false;
+    }
+
 }
diff --git a/logback-core/src/main/java/ch/qos/logback/core/model/processor/ImplicitModelHandler.java b/logback-core/src/main/java/ch/qos/logback/core/model/processor/ImplicitModelHandler.java
@@ -203,8 +203,7 @@ private void postHandleComplex(ModelInterpretationContext mic, Model model,
         // start the nested complex property if it implements LifeCycle and is not
         // marked with a @NoAutoStart annotation
         Object nestedComplexProperty = imdComplex.getNestedComplexProperty();
-        if (nestedComplexProperty instanceof LifeCycle
-                && NoAutoStartUtil.notMarkedWithNoAutoStart(nestedComplexProperty)) {
+        if (NoAutoStartUtil.shouldBeStarted(nestedComplexProperty)) {
             ((LifeCycle) nestedComplexProperty).start();
         }