svn commit: r1757800 - /jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java

[reschke]

Author: reschke
Date: Fri Aug 26 09:14:35 2016
New Revision: 1757800

URL: http://svn.apache.org/viewvc?rev=1757800&view=rev
Log:
OAK-4615: RDBDocumentStore: in 1.0, cache invalidation is slightly different 
from 1.2 - made 1.2 identical to 1.0

Modified:
    
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java

Modified: 
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java?rev=1757800&r1=1757799&r2=1757800&view=diff
==============================================================================
--- 
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java
 (original)
+++ 
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java
 Fri Aug 26 09:14:35 2016
@@ -1128,10 +1128,13 @@ public class RDBDocumentStore implements
             String appendData = ser.asString(update);
 
             for (List<String> chunkedIds : Lists.partition(ids, CHUNKSIZE)) {
-
                 Set<QueryContext> seenQueryContext = Collections.emptySet();
 
                 if (collection == Collection.NODES) {
+                    for (String id : chunkedIds) {
+                        nodesCache.invalidate(id);
+                    }
+
                     // keep concurrently running queries from updating
                     // the cache entry for this key
                     seenQueryContext = new HashSet<QueryContext>();
@@ -1139,9 +1142,6 @@ public class RDBDocumentStore implements
                         qc.addKeys(chunkedIds);
                         seenQueryContext.add(qc);
                     }
-                    for (String id : chunkedIds) {
-                        nodesCache.invalidate(id);
-                    }
                 }
 
                 Connection connection = null;