svn commit: r1801118 - in /jackrabbit/oak/trunk/oak-blob-plugins/src: main/java/org/apache/jackrabbit/oak/plugins/blob/FileCache.java test/java/org/apache/jackrabbit/oak/plugins/blob/FileCacheTest.java

[amitj]

Author: amitj
Date: Fri Jul  7 05:23:13 2017
New Revision: 1801118

URL: http://svn.apache.org/viewvc?rev=1801118&view=rev
Log:
OAK-6413: FileCache getIfPresent doesn't update cache hit/miss counters

Directly calling CacheLirs.getIfPresent() to properly update hit/miss counter

Modified:
    
jackrabbit/oak/trunk/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/FileCache.java
    
jackrabbit/oak/trunk/oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/FileCacheTest.java

Modified: 
jackrabbit/oak/trunk/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/FileCache.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/FileCache.java?rev=1801118&r1=1801117&r2=1801118&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/FileCache.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/FileCache.java
 Fri Jul  7 05:23:13 2017
@@ -236,9 +236,7 @@ public class FileCache extends AbstractC
     @Nullable
     public File getIfPresent(String key) {
         try {
-            if (cache.containsKey(key)) {
-                return cache.get(key);
-            }
+            return cache.getIfPresent(key);
         } catch (Exception e) {
             LOG.error("Error in retrieving [{}] from cache", key, e);
         }

Modified: 
jackrabbit/oak/trunk/oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/FileCacheTest.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/FileCacheTest.java?rev=1801118&r1=1801117&r2=1801118&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/FileCacheTest.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/FileCacheTest.java
 Fri Jul  7 05:23:13 2017
@@ -155,7 +155,7 @@ public class FileCacheTest extends Abstr
         File file = cache.getIfPresent((Object) (ID_PREFIX + 0));
         assertNull(file);
         assertCacheStats(cache, 0, 0, 0, 0);
-
+        assertEquals(1, cache.getStats().getMissCount());
         LOG.info("Finished getIfPresentObjectNoCache");
     }