Author: markt
Date: Wed Oct 19 09:16:26 2011
New Revision: 1186042
URL: http://svn.apache.org/viewvc?rev=1186042&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52042
Correct threading issue in annotation caching that could lead to an
NPE if multiple threads were processing the same class hierarchy for
annotations
Modified:
tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java
Modified: tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java?rev=1186042&r1=1186041&r2=1186042&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java Wed
Oct 19 09:16:26 2011
@@ -423,11 +423,6 @@ public class DefaultInstanceManager impl
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
- // as well
- break;
}
clazz = clazz.getSuperclass();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
