svn commit: r1523293 - in /tomcat/trunk/java/org/apache/catalina/webresources: Cache.java StandardRoot.java

[markt]

Author: markt
Date: Sat Sep 14 18:59:45 2013
New Revision: 1523293

URL: http://svn.apache.org/r1523293
Log:
Fix broken unit test now caching has been fixed.

Modified:
    tomcat/trunk/java/org/apache/catalina/webresources/Cache.java
    tomcat/trunk/java/org/apache/catalina/webresources/StandardRoot.java

Modified: tomcat/trunk/java/org/apache/catalina/webresources/Cache.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/webresources/Cache.java?rev=1523293&r1=1523292&r2=1523293&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/webresources/Cache.java (original)
+++ tomcat/trunk/java/org/apache/catalina/webresources/Cache.java Sat Sep 14 
18:59:45 2013
@@ -205,6 +205,10 @@ public class Cache {
         return maxObjectSize / 1024;
     }
 
+    public void clear() {
+        resourceCache.clear();
+    }
+
     private static class EvictionOrder implements Comparator<CachedResource> {
 
         @Override

Modified: tomcat/trunk/java/org/apache/catalina/webresources/StandardRoot.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/webresources/StandardRoot.java?rev=1523293&r1=1523292&r2=1523293&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/webresources/StandardRoot.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/webresources/StandardRoot.java Sat 
Sep 14 18:59:45 2013
@@ -496,6 +496,8 @@ public class StandardRoot extends Lifecy
         }
         jarResources.clear();
 
+        cache.clear();
+
         setState(LifecycleState.STOPPING);
     }
 



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org