Author: markt
Date: Mon Sep 19 16:47:03 2011
New Revision: 1172696
URL: http://svn.apache.org/viewvc?rev=1172696&view=rev
Log:
Fix resource leak in annotations cache that prevented unloading of resources
that used annotations
Added:
tomcat/tc7.0.x/trunk/test/org/apache/catalina/core/TestDefaultInstanceManager.java
- copied unchanged from r1172664,
tomcat/trunk/test/org/apache/catalina/core/TestDefaultInstanceManager.java
tomcat/tc7.0.x/trunk/test/webapp-3.0/annotations.jsp
- copied unchanged from r1172664,
tomcat/trunk/test/webapp-3.0/annotations.jsp
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 19 16:47:03 2011
@@ -1 +1 @@
-/tomcat/trunk:1156171,1156276,1156304,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166752,1166757,1167368,1167394,1169447,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172610
+/tomcat/trunk:1156171,1156276,1156304,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166752,1166757,1167368,1167394,1169447,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172610,1172664
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java?rev=1172696&r1=1172695&r2=1172696&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java
Mon Sep 19 16:47:03 2011
@@ -21,6 +21,7 @@ package org.apache.catalina.core;
import java.io.IOException;
import java.io.InputStream;
+import java.lang.ref.WeakReference;
import java.lang.reflect.AccessibleObject;
import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException;
@@ -35,7 +36,7 @@ import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Properties;
-import java.util.concurrent.ConcurrentHashMap;
+import java.util.WeakHashMap;
import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy;
@@ -70,8 +71,8 @@ public class DefaultInstanceManager impl
private Properties restrictedFilters = new Properties();
private Properties restrictedListeners = new Properties();
private Properties restrictedServlets = new Properties();
- private Map<Class<?>,List<AnnotationCacheEntry>> annotationCache =
- new ConcurrentHashMap<Class<?>, List<AnnotationCacheEntry>>();
+ private final Map<Class<?>,WeakReference<List<AnnotationCacheEntry>>>
annotationCache =
+ new WeakHashMap<Class<?>, WeakReference<List<AnnotationCacheEntry>>>();
public DefaultInstanceManager(Context context, Map<String, Map<String,
String>> injectionMap, org.apache.catalina.Context catalinaContext, ClassLoader
containerClassLoader) {
classLoader = catalinaContext.getLoader().getClassLoader();
@@ -178,7 +179,10 @@ public class DefaultInstanceManager impl
// At the end the postconstruct annotated
// method is invoked
- List<AnnotationCacheEntry> annotations = annotationCache.get(clazz);
+ List<AnnotationCacheEntry> annotations;
+ synchronized (annotationCache) {
+ annotations = annotationCache.get(clazz).get();
+ }
for (AnnotationCacheEntry entry : annotations) {
if (entry.getType() == AnnotationCacheEntryType.POST_CONSTRUCT) {
Method postConstruct = (Method) entry.getAccessibleObject();
@@ -209,7 +213,14 @@ public class DefaultInstanceManager impl
// At the end the postconstruct annotated
// method is invoked
- List<AnnotationCacheEntry> annotations = annotationCache.get(clazz);
+ List<AnnotationCacheEntry> annotations = null;
+ synchronized (annotationCache) {
+ WeakReference<List<AnnotationCacheEntry>> ref =
+ annotationCache.get(clazz);
+ if (ref != null) {
+ annotations = ref.get();
+ }
+ }
if (annotations == null) {
// instance not created through the instance manager
return;
@@ -248,7 +259,14 @@ public class DefaultInstanceManager impl
}
while (clazz != null) {
- List<AnnotationCacheEntry> annotations =
annotationCache.get(clazz);
+ List<AnnotationCacheEntry> annotations = null;
+ synchronized (annotationCache) {
+ WeakReference<List<AnnotationCacheEntry>> ref =
+ annotationCache.get(clazz);
+ if (ref != null) {
+ annotations = ref.get();
+ }
+ }
if (annotations == null) {
annotations = new ArrayList<AnnotationCacheEntry>();
// Initialize fields annotations
@@ -394,7 +412,11 @@ public class DefaultInstanceManager impl
// Use common empty list to save memory
annotations = Collections.emptyList();
}
- annotationCache.put(clazz, annotations);
+ synchronized (annotationCache) {
+ annotationCache.put(clazz,
+ new WeakReference<List<AnnotationCacheEntry>>(
+ annotations));
+ }
} else {
// If the annotations for this class have been cached, the
// annotations for all the super classes will have been cachced
@@ -427,7 +449,10 @@ public class DefaultInstanceManager impl
Class<?> clazz = instance.getClass();
while (clazz != null) {
- List<AnnotationCacheEntry> annotations =
annotationCache.get(clazz);
+ List<AnnotationCacheEntry> annotations;
+ synchronized (annotationCache) {
+ annotations = annotationCache.get(clazz).get();
+ }
for (AnnotationCacheEntry entry : annotations) {
if (entry.getType() == AnnotationCacheEntryType.FIELD) {
if (entry.getAccessibleObject() instanceof Method) {
@@ -446,6 +471,16 @@ public class DefaultInstanceManager impl
}
+ /**
+ * Makes cache size available to unit tests.
+ */
+ protected int getAnnotationCacheSize() {
+ synchronized (annotationCache) {
+ return annotationCache.size();
+ }
+ }
+
+
protected Class<?> loadClassMaybePrivileged(final String className, final
ClassLoader classLoader) throws ClassNotFoundException {
Class<?> clazz;
if (SecurityUtil.isPackageProtectionEnabled()) {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
