From 070729d2c8125536dcc1b8f4758368bd8973864c Mon Sep 17 00:00:00 2001 From: markt Date: Mon, 19 Sep 2011 10:00:04 +0000 Subject: [PATCH] Prevent NPE if JNDI is disabled. git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1172546 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/catalina/core/DefaultInstanceManager.java | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/java/org/apache/catalina/core/DefaultInstanceManager.java b/java/org/apache/catalina/core/DefaultInstanceManager.java index 9fc69ffb3..a542e3db1 100644 --- a/java/org/apache/catalina/core/DefaultInstanceManager.java +++ b/java/org/apache/catalina/core/DefaultInstanceManager.java @@ -179,13 +179,15 @@ public class DefaultInstanceManager implements InstanceManager { // At the end the postconstruct annotated // method is invoked List annotations = annotationCache.get(clazz); - for (AnnotationCacheEntry entry : annotations) { - if (entry.getType() == AnnotationCacheEntryType.POST_CONSTRUCT) { - Method postConstruct = (Method) entry.getAccessibleObject(); - boolean accessibility = postConstruct.isAccessible(); - postConstruct.setAccessible(true); - postConstruct.invoke(instance); - postConstruct.setAccessible(accessibility); + if (annotations != null) { + for (AnnotationCacheEntry entry : annotations) { + if (entry.getType() == AnnotationCacheEntryType.POST_CONSTRUCT) { + Method postConstruct = (Method) entry.getAccessibleObject(); + boolean accessibility = postConstruct.isAccessible(); + postConstruct.setAccessible(true); + postConstruct.invoke(instance); + postConstruct.setAccessible(accessibility); + } } } } -- 2.11.0