You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by ma...@apache.org on 2021/07/26 01:12:50 UTC
[logging-log4j2] 04/05: Check for scope of bean class as fallback
This is an automated email from the ASF dual-hosted git repository.
mattsicker pushed a commit to branch mean-bean-machine
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit 1e33a72062f2db54a1504b2393199aed2f8a73a6
Author: Matt Sicker <bo...@gmail.com>
AuthorDate: Sun Jul 25 16:25:02 2021 -0500
Check for scope of bean class as fallback
---
.../logging/log4j/core/config/di/impl/DefaultBeanManager.java | 6 ++++++
.../org/apache/logging/log4j/core/config/di/BeanManagerTest.java | 1 -
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/di/impl/DefaultBeanManager.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/di/impl/DefaultBeanManager.java
index 9d9ecce..5e13e18 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/di/impl/DefaultBeanManager.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/di/impl/DefaultBeanManager.java
@@ -353,6 +353,12 @@ public class DefaultBeanManager implements BeanManager {
return annotationType;
}
}
+ if (element instanceof Field) {
+ return getScopeType(((Field) element).getType());
+ }
+ if (element instanceof Method) {
+ return getScopeType(((Method) element).getReturnType());
+ }
return DependentScoped.class;
}
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/di/BeanManagerTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/di/BeanManagerTest.java
index 1432ea3..3f67266 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/di/BeanManagerTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/di/BeanManagerTest.java
@@ -59,7 +59,6 @@ class BeanManagerTest {
@Produces
@Named
- @SingletonScoped
static SingletonBean getSingleton() {
return new SingletonBean();
}