svn commit: r1821134 - in /jackrabbit/oak/branches/1.8: ./ oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/CacheMap.java

[mreutegg]

Author: mreutegg
Date: Mon Jan 15 08:59:11 2018
New Revision: 1821134

URL: http://svn.apache.org/viewvc?rev=1821134&view=rev
Log:
OAK-7152: CacheMap.clear() never returns

Merge revision 1821130 from trunk

Modified:
    jackrabbit/oak/branches/1.8/   (props changed)
    
jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/CacheMap.java

Propchange: jackrabbit/oak/branches/1.8/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 15 08:59:11 2018
@@ -1,3 +1,3 @@
 /jackrabbit/oak/branches/1.0:1665962
-/jackrabbit/oak/trunk:1820660-1820661,1820861,1820878,1820947
+/jackrabbit/oak/trunk:1820660-1820661,1820861,1820878,1820947,1821130
 /jackrabbit/trunk:1345480

Modified: 
jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/CacheMap.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/CacheMap.java?rev=1821134&r1=1821133&r2=1821134&view=diff
==============================================================================
--- 
jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/CacheMap.java
 (original)
+++ 
jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/CacheMap.java
 Mon Jan 15 08:59:11 2018
@@ -124,6 +124,7 @@ public class CacheMap<K, V> {
             }
             try {
                 map.clear();
+                return;
             } catch (Exception e) {
                 reopen(i, e);
             }