From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Mon, 19 Sep 2011 10:11:44 +0000 (+0000)
Subject: Always process postConstruct / preDestroy annotations but only process resource annot... 
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=19ac2e8d69384f648642b166a94883f4bcd1d974;p=tomcat7.0

Always process postConstruct / preDestroy annotations but only process resource annotations if JNDI is enabled.


git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1172556 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/java/org/apache/catalina/core/DefaultInstanceManager.java b/java/org/apache/catalina/core/DefaultInstanceManager.java
index 9fc69ffb3..9a5972c54 100644
--- a/java/org/apache/catalina/core/DefaultInstanceManager.java
+++ b/java/org/apache/catalina/core/DefaultInstanceManager.java
@@ -242,62 +242,61 @@ public class DefaultInstanceManager implements InstanceManager {
             Map<String, String> injections) throws IllegalAccessException,
             InvocationTargetException, NamingException {
 
-        if (context == null) {
-            // No resource injection
-            return;
-        }
-
         while (clazz != null) {
             List<AnnotationCacheEntry> annotations = annotationCache.get(clazz);
             if (annotations == null) {
                 annotations = new ArrayList<AnnotationCacheEntry>();
-                // Initialize fields annotations
-                Field[] fields = null;
-                if (Globals.IS_SECURITY_ENABLED) {
-                    final Class<?> clazz2 = clazz;
-                    fields = AccessController.doPrivileged(
-                            new PrivilegedAction<Field[]>(){
-                        @Override
-                        public Field[] run(){
-                            return clazz2.getDeclaredFields();
+                
+                if (context != null) {
+                    // Initialize fields annotations for resource injection if
+                    // JNDI is enabled
+                    Field[] fields = null;
+                    if (Globals.IS_SECURITY_ENABLED) {
+                        final Class<?> clazz2 = clazz;
+                        fields = AccessController.doPrivileged(
+                                new PrivilegedAction<Field[]>(){
+                            @Override
+                            public Field[] run(){
+                                return clazz2.getDeclaredFields();
+                            }
+                        });
+                    } else {
+                        fields = clazz.getDeclaredFields();
+                    }
+                    for (Field field : fields) {
+                        if (injections != null && injections.containsKey(field.getName())) {
+                            annotations.add(new AnnotationCacheEntry(field,
+                                    injections.get(field.getName()),
+                                    AnnotationCacheEntryType.FIELD));
+                        } else if (field.isAnnotationPresent(Resource.class)) {
+                            Resource annotation = field.getAnnotation(Resource.class);
+                            annotations.add(new AnnotationCacheEntry(field,
+                                    annotation.name(),
+                                    AnnotationCacheEntryType.FIELD));
+                        } else if (field.isAnnotationPresent(EJB.class)) {
+                            EJB annotation = field.getAnnotation(EJB.class);
+                            annotations.add(new AnnotationCacheEntry(field,
+                                    annotation.name(),
+                                    AnnotationCacheEntryType.FIELD));
+                        } else if (field.isAnnotationPresent(WebServiceRef.class)) {
+                            WebServiceRef annotation =
+                                    field.getAnnotation(WebServiceRef.class);
+                            annotations.add(new AnnotationCacheEntry(field,
+                                    annotation.name(),
+                                    AnnotationCacheEntryType.FIELD));
+                        } else if (field.isAnnotationPresent(PersistenceContext.class)) {
+                            PersistenceContext annotation =
+                                    field.getAnnotation(PersistenceContext.class);
+                            annotations.add(new AnnotationCacheEntry(field,
+                                    annotation.name(),
+                                    AnnotationCacheEntryType.FIELD));
+                        } else if (field.isAnnotationPresent(PersistenceUnit.class)) {
+                            PersistenceUnit annotation =
+                                    field.getAnnotation(PersistenceUnit.class);
+                            annotations.add(new AnnotationCacheEntry(field,
+                                    annotation.name(),
+                                    AnnotationCacheEntryType.FIELD));
                         }
-                    });
-                } else {
-                    fields = clazz.getDeclaredFields();
-                }
-                for (Field field : fields) {
-                    if (injections != null && injections.containsKey(field.getName())) {
-                        annotations.add(new AnnotationCacheEntry(field,
-                                injections.get(field.getName()),
-                                AnnotationCacheEntryType.FIELD));
-                    } else if (field.isAnnotationPresent(Resource.class)) {
-                        Resource annotation = field.getAnnotation(Resource.class);
-                        annotations.add(new AnnotationCacheEntry(field,
-                                annotation.name(),
-                                AnnotationCacheEntryType.FIELD));
-                    } else if (field.isAnnotationPresent(EJB.class)) {
-                        EJB annotation = field.getAnnotation(EJB.class);
-                        annotations.add(new AnnotationCacheEntry(field,
-                                annotation.name(),
-                                AnnotationCacheEntryType.FIELD));
-                    } else if (field.isAnnotationPresent(WebServiceRef.class)) {
-                        WebServiceRef annotation =
-                                field.getAnnotation(WebServiceRef.class);
-                        annotations.add(new AnnotationCacheEntry(field,
-                                annotation.name(),
-                                AnnotationCacheEntryType.FIELD));
-                    } else if (field.isAnnotationPresent(PersistenceContext.class)) {
-                        PersistenceContext annotation =
-                                field.getAnnotation(PersistenceContext.class);
-                        annotations.add(new AnnotationCacheEntry(field,
-                                annotation.name(),
-                                AnnotationCacheEntryType.FIELD));
-                    } else if (field.isAnnotationPresent(PersistenceUnit.class)) {
-                        PersistenceUnit annotation =
-                                field.getAnnotation(PersistenceUnit.class);
-                        annotations.add(new AnnotationCacheEntry(field,
-                                annotation.name(),
-                                AnnotationCacheEntryType.FIELD));
                     }
                 }
         
@@ -319,44 +318,47 @@ public class DefaultInstanceManager implements InstanceManager {
                 Method preDestroy = null;
                 for (Method method : methods) {
                     String methodName = method.getName();
-                    if (injections != null && methodName.startsWith("set") && methodName.length() > 3) {
-                        String fieldName = Character.toLowerCase(methodName.charAt(3)) + methodName.substring(4);
-                        if (injections.containsKey(fieldName)) {
+                    if (context != null) {
+                        // Resource injection only if JNDI is enabled
+                        if (injections != null && methodName.startsWith("set") && methodName.length() > 3) {
+                            String fieldName = Character.toLowerCase(methodName.charAt(3)) + methodName.substring(4);
+                            if (injections.containsKey(fieldName)) {
+                                annotations.add(new AnnotationCacheEntry(method,
+                                        injections.get(method.getName()),
+                                        AnnotationCacheEntryType.FIELD));
+                                break;
+                            }
+                        }
+                        if (method.isAnnotationPresent(Resource.class)) {
+                            Resource annotation = method.getAnnotation(Resource.class);
+                            annotations.add(new AnnotationCacheEntry(method,
+                                    annotation.name(),
+                                    AnnotationCacheEntryType.FIELD));
+                        } else if (method.isAnnotationPresent(EJB.class)) {
+                            EJB annotation = method.getAnnotation(EJB.class);
                             annotations.add(new AnnotationCacheEntry(method,
-                                    injections.get(method.getName()),
+                                    annotation.name(),
+                                    AnnotationCacheEntryType.FIELD));
+                        } else if (method.isAnnotationPresent(WebServiceRef.class)) {
+                            WebServiceRef annotation =
+                                    method.getAnnotation(WebServiceRef.class);
+                            annotations.add(new AnnotationCacheEntry(method,
+                                    annotation.name(),
+                                    AnnotationCacheEntryType.FIELD));
+                        } else if (method.isAnnotationPresent(PersistenceContext.class)) {
+                            PersistenceContext annotation =
+                                    method.getAnnotation(PersistenceContext.class);
+                            annotations.add(new AnnotationCacheEntry(method,
+                                    annotation.name(),
+                                    AnnotationCacheEntryType.FIELD));
+                        } else if (method.isAnnotationPresent(PersistenceUnit.class)) {
+                            PersistenceUnit annotation =
+                                    method.getAnnotation(PersistenceUnit.class);
+                            annotations.add(new AnnotationCacheEntry(method,
+                                    annotation.name(),
                                     AnnotationCacheEntryType.FIELD));
-                            break;
                         }
                     }
-                    if (method.isAnnotationPresent(Resource.class)) {
-                        Resource annotation = method.getAnnotation(Resource.class);
-                        annotations.add(new AnnotationCacheEntry(method,
-                                annotation.name(),
-                                AnnotationCacheEntryType.FIELD));
-                    } else if (method.isAnnotationPresent(EJB.class)) {
-                        EJB annotation = method.getAnnotation(EJB.class);
-                        annotations.add(new AnnotationCacheEntry(method,
-                                annotation.name(),
-                                AnnotationCacheEntryType.FIELD));
-                    } else if (method.isAnnotationPresent(WebServiceRef.class)) {
-                        WebServiceRef annotation =
-                                method.getAnnotation(WebServiceRef.class);
-                        annotations.add(new AnnotationCacheEntry(method,
-                                annotation.name(),
-                                AnnotationCacheEntryType.FIELD));
-                    } else if (method.isAnnotationPresent(PersistenceContext.class)) {
-                        PersistenceContext annotation =
-                                method.getAnnotation(PersistenceContext.class);
-                        annotations.add(new AnnotationCacheEntry(method,
-                                annotation.name(),
-                                AnnotationCacheEntryType.FIELD));
-                    } else if (method.isAnnotationPresent(PersistenceUnit.class)) {
-                        PersistenceUnit annotation =
-                                method.getAnnotation(PersistenceUnit.class);
-                        annotations.add(new AnnotationCacheEntry(method,
-                                annotation.name(),
-                                AnnotationCacheEntryType.FIELD));
-                    }
 
                     if (method.isAnnotationPresent(PostConstruct.class)) {
                         if ((postConstruct != null) ||