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 2020/03/29 18:59:10 UTC

[logging-log4j2] 03/08: Rearrange code for clarity

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 7f8995b1fbdf0bb14fc923de9dcc6ca4595436b2
Author: Matt Sicker <bo...@gmail.com>
AuthorDate: Sat Mar 28 13:01:47 2020 -0500

    Rearrange code for clarity
    
    Signed-off-by: Matt Sicker <bo...@gmail.com>
---
 .../log4j/plugins/defaults/bean/DefaultInjectionTarget.java    | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/defaults/bean/DefaultInjectionTarget.java b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/defaults/bean/DefaultInjectionTarget.java
index a9052b8..ff56366 100644
--- a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/defaults/bean/DefaultInjectionTarget.java
+++ b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/defaults/bean/DefaultInjectionTarget.java
@@ -70,11 +70,6 @@ class DefaultInjectionTarget<T> implements InjectionTarget<T> {
     public void inject(final T instance, final InitializationContext<T> context) {
         injectFields(instance, context);
         injectMethods(instance, context);
-        for (final MetaMethod<T, ?> method : metaClass.getMethods()) {
-            if (method.isAnnotationPresent(Inject.class) && method.getParameters().isEmpty()) {
-                injector.invoke(instance, method, Collections.emptySet(), context);
-            }
-        }
     }
 
     private void injectFields(final T instance, final InitializationContext<T> context) {
@@ -98,6 +93,11 @@ class DefaultInjectionTarget<T> implements InjectionTarget<T> {
                 injectedMethods.add(method);
             }
         }
+        for (final MetaMethod<T, ?> method : metaClass.getMethods()) {
+            if (method.isAnnotationPresent(Inject.class) && method.getParameters().isEmpty()) {
+                injector.invoke(instance, method, Collections.emptySet(), context);
+            }
+        }
     }
 
     @Override