Skip to content

Commit 681b2be

Browse files
committed
remove unused method, minor comment edits
Signed-off-by: ceki <[email protected]>
1 parent 17a3edf commit 681b2be

2 files changed

Lines changed: 2 additions & 20 deletions

File tree

logback-core/src/main/java/ch/qos/logback/core/model/processor/AppenderRefDependencyAnalyser.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public void handle(ModelInterpretationContext mic, Model model) throws ModelHand
3838

3939
Model depender;
4040
if (mic.isModelStackEmpty()) {
41-
// appenderRefModel maybe the dependent model. This is the case in logback-access
41+
// appenderRefModel maybe the depender. This is the case in logback-access
4242
depender = appenderRefModel;
4343
} else {
4444
Model parentModel = mic.peekModel();

logback-core/src/main/java/ch/qos/logback/core/model/processor/DefaultProcessor.java

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -281,6 +281,7 @@ private boolean dependencyIsADirectSubmodel(Model model) {
281281
}
282282

283283
private boolean allDependenciesStarted(Model model) {
284+
// assumes that DependencyDefinitions have been registered
284285
List<String> dependencyNames = mic.getDependeeNamesForModel(model);
285286

286287
if (dependencyNames == null || dependencyNames.isEmpty()) {
@@ -295,25 +296,6 @@ private boolean allDependenciesStarted(Model model) {
295296
return true;
296297
}
297298

298-
ModelHandlerBase instantiateHandler(Class<? extends ModelHandlerBase> handlerClass) {
299-
try {
300-
Constructor<? extends ModelHandlerBase> commonConstructor = getWithContextConstructor(handlerClass);
301-
if (commonConstructor != null) {
302-
return commonConstructor.newInstance(context);
303-
}
304-
Constructor<? extends ModelHandlerBase> constructorWithBDC = getWithContextAndBDCConstructor(handlerClass);
305-
if (constructorWithBDC != null) {
306-
return constructorWithBDC.newInstance(context, mic.getBeanDescriptionCache());
307-
}
308-
addError("Failed to find suitable constructor for class [" + handlerClass + "]");
309-
return null;
310-
} catch (InstantiationException | IllegalAccessException | SecurityException | IllegalArgumentException
311-
| InvocationTargetException e1) {
312-
addError("Failed to instantiate " + handlerClass);
313-
return null;
314-
}
315-
}
316-
317299
private Constructor<? extends ModelHandlerBase> getWithContextConstructor(
318300
Class<? extends ModelHandlerBase> handlerClass) {
319301
try {

0 commit comments

Comments
 (0)