Author: kkolinko
Date: Wed Mar 3 17:13:04 2010
New Revision: 918581
URL: http://svn.apache.org/viewvc?rev=918581&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47987
Limit size of not found resources cache
Modified:
tomcat/tc5.5.x/trunk/STATUS.txt
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/loader/WebappClassLoader.java
tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml
Modified: tomcat/tc5.5.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=918581&r1=918580&r2=918581&view=diff
==============================================================================
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Wed Mar 3 17:13:04 2010
@@ -140,15 +140,6 @@
+1: markt, kkolinko, rjung
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47987
- http://svn.apache.org/viewvc?rev=832200&view=rev
- Limit size of not found resources cache
- +1: markt
- +1: kkolinko, rjung (minus generics)
- -1:
- kkolinko: LinkedHashMap is present in JDK 1.4 (At first I thought it was
- added in 1.5 only, but I was wrong).
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48581
Avoid security exception on first access
http://people.apache.org/~markt/patches/2010-02-02-bug48581.patch
Modified:
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/loader/WebappClassLoader.java
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/loader/WebappClassLoader.java?rev=918581&r1=918580&r2=918581&view=diff
==============================================================================
---
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/loader/WebappClassLoader.java
(original)
+++
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/loader/WebappClassLoader.java
Wed Mar 3 17:13:04 2010
@@ -44,6 +44,7 @@
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
+import java.util.LinkedHashMap;
import java.util.Map;
import java.util.Set;
import java.util.Vector;
@@ -265,7 +266,13 @@
/**
* The list of not found resources.
*/
- protected HashMap notFoundResources = new HashMap();
+ protected HashMap notFoundResources = new LinkedHashMap() {
+ private static final long serialVersionUID = 1L;
+ protected boolean removeEldestEntry(
+ Map.Entry eldest) {
+ return size() > 1000;
+ }
+ };
/**
Modified: tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml?rev=918581&r1=918580&r2=918581&view=diff
==============================================================================
--- tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml (original)
+++ tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml Wed Mar 3
17:13:04 2010
@@ -164,6 +164,9 @@
Greg Vanore. (markt)
</fix>
<fix>
+ <bug>47987</bug>: Limit size of not found resources cache. (markt)
+ </fix>
+ <fix>
<bug>48311</bug>: APR should not be initialised if the APR life-cycle
listener is not enabled. (markt)
</fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
