fix issues/1016

ceki · ceki · commit 9ff843d5a171 · 2026-02-05T19:13:38.000+01:00
Signed-off-by: ceki &lt;ceki@qos.ch&gt;
diff --git a/logback-classic-blackbox/src/test/blackboxInput/joran/conditional/topConditionalWithAppenderInclusion.xml b/logback-classic-blackbox/src/test/blackboxInput/joran/conditional/topConditionalWithAppenderInclusion.xml
@@ -5,7 +5,7 @@
             <include optional="true" resource="missing.xml"/>
         </then>
         <else>
-            <include resource="src/test/input/joran/collision/included.xml"/>
+            <include file="src/test/blackboxInput/joran/conditional/includedConditionalWithAppenderInclusion.xml"/>
         </else>
     </if>
 </configuration>
diff --git a/logback-classic-blackbox/src/test/java/ch/qos/logback/classic/blackbox/joran/BlackboxJoranConfiguratorTest.java b/logback-classic-blackbox/src/test/java/ch/qos/logback/classic/blackbox/joran/BlackboxJoranConfiguratorTest.java
@@ -24,6 +24,7 @@
 import ch.qos.logback.classic.spi.ILoggingEvent;
 import ch.qos.logback.classic.util.DefaultJoranConfigurator;
 import ch.qos.logback.classic.util.LogbackMDCAdapter;
+import ch.qos.logback.core.Appender;
 import ch.qos.logback.core.joran.spi.JoranException;
 import ch.qos.logback.core.read.ListAppender;
 import ch.qos.logback.core.testUtil.RandomUtil;
@@ -133,6 +134,19 @@ public void conditional1673bisWithActiveThen() throws JoranException {
         assertNull(listElse);
     }
 
+    // See also https://github.com/qos-ch/logback/issues/1016
+    @Test
+    public void conditionalWithAppenderInclusion() throws JoranException {
+        String configFileAsStr = BlackboxClassicTestConstants.JORAN_INPUT_PREFIX + "conditional/topConditionalWithAppenderInclusion.xml";
+        configure(configFileAsStr);
+        Logger root = loggerContext.getLogger(Logger.ROOT_LOGGER_NAME);
+        Appender<ILoggingEvent> appender = root.getAppender("MISSING");
+        assertNull(appender);
+
+        ListAppender<ILoggingEvent> listElse = (ListAppender<ILoggingEvent>) root.getAppender("LIST");
+        assertNotNull(listElse);
+    }
+
     @Test
     public void conditional1673bisWithActiveElse() throws JoranException {
         String configFileAsStr = BlackboxClassicTestConstants.JORAN_INPUT_PREFIX + "issues/logback_1673bis.xml";
diff --git a/logback-core/src/main/java/ch/qos/logback/core/model/processor/AppenderRefDependencyAnalyser.java b/logback-core/src/main/java/ch/qos/logback/core/model/processor/AppenderRefDependencyAnalyser.java
@@ -36,16 +36,26 @@ protected Class<Model> getSupportedModelClass() {
     @Override
     public void handle(ModelInterpretationContext mic, Model parentModel) throws ModelHandlerException {
 
-        List<AppenderRefModel> appenderRefModels =
-                parentModel.getSubModels().stream().filter(m -> m instanceof AppenderRefModel).map(m -> (AppenderRefModel) m).collect(Collectors.toList());
+        System.out.println("Handling " + parentModel);
+        List<AppenderRefModel> appenderRefModelList = new java.util.ArrayList<>();
 
+        getAllAppenderRefModels(appenderRefModelList, parentModel);
 
-        for (AppenderRefModel appenderRefModel : appenderRefModels) {
+        for (AppenderRefModel appenderRefModel : appenderRefModelList) {
             String ref = mic.subst(appenderRefModel.getRef());
             DependencyDefinition dd = new DependencyDefinition(parentModel, ref);
             mic.addDependencyDefinition(dd);
         }
 
     }
 
+    public void getAllAppenderRefModels(List<AppenderRefModel> list, Model model) {
+        if(model == null)
+            return;
+        if(model instanceof AppenderRefModel) {
+            list.add((AppenderRefModel) model);
+        }
+        model.getSubModels().forEach(subModel -> getAllAppenderRefModels(list, subModel));
+    }
+
 }
diff --git a/logback-core/src/main/java/ch/qos/logback/core/model/processor/DependencyDefinition.java b/logback-core/src/main/java/ch/qos/logback/core/model/processor/DependencyDefinition.java
@@ -26,8 +26,9 @@
  */
 public class DependencyDefinition {
 
-    // OLD terminology: depender: a component of type Model which depends on a dependee
-    // NEW terminology: dependent: a component of type Model which depends on a dependency
+    // OLD terminology: dependee (=dependency), dependent(=depender)
+    //
+    // NEW terminology: *dependent*: a component of type Model which depends on a *dependency*
     Model depender;
     // dependee or dependency: the string name of a component depended upon by the depender of type Model
     String dependency;
