/hg/icedtea-web: Fixed CacheUtil clearCache to also remove LRU e...

[jkang at icedtea.classpath.org]

changeset 2979fa371add in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=2979fa371add
author: Jie Kang <jkang at redhat.com>
date: Tue Sep 02 11:46:09 2014 -0400

	Fixed CacheUtil clearCache to also remove LRU entries.

	2014-09-02  Jie Kang  <jkang at redhat.com>

		Fixed CacheUtils clearCache method to also clear the Least Recently Used
		entries.
		* netx/net/sourceforge/jnlp/cache/CacheUtil.java


diffstat:

 ChangeLog                                      |  6 ++++++
 netx/net/sourceforge/jnlp/cache/CacheUtil.java |  5 +++++
 2 files changed, 11 insertions(+), 0 deletions(-)

diffs (34 lines):

diff -r c45cd47e962b -r 2979fa371add ChangeLog
--- a/ChangeLog	Wed Aug 20 15:49:58 2014 -0400
+++ b/ChangeLog	Tue Sep 02 11:46:09 2014 -0400
@@ -1,3 +1,9 @@
+2014-09-02  Jie Kang  <jkang at redhat.com>
+
+	Fixed CacheUtils clearCache method to also clear the Least Recently Used
+	entries.
+	* netx/net/sourceforge/jnlp/cache/CacheUtil.java:
+
 2014-08-20  Jie Kang  <jkang at redhat.com>
 
 	Improved CacheEntry locking system to respect threads and processes.
diff -r c45cd47e962b -r 2979fa371add netx/net/sourceforge/jnlp/cache/CacheUtil.java
--- a/netx/net/sourceforge/jnlp/cache/CacheUtil.java	Wed Aug 20 15:49:58 2014 -0400
+++ b/netx/net/sourceforge/jnlp/cache/CacheUtil.java	Tue Sep 02 11:46:09 2014 -0400
@@ -134,12 +134,17 @@
         }
 
         OutputController.getLogger().log(OutputController.Level.ERROR_DEBUG, "Clearing cache directory: " + cacheDir);
+        lruHandler.lock();
         try {
             cacheDir = cacheDir.getCanonicalFile();
             FileUtils.recursiveDelete(cacheDir, cacheDir);
             cacheDir.mkdir();
+            lruHandler.clearLRUSortedEntries();
+            lruHandler.store();
         } catch (IOException e) {
             throw new RuntimeException(e);
+        } finally {
+            lruHandler.unlock();
         }
         return true;
     }