You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by mr...@apache.org on 2017/03/22 10:34:06 UTC

svn commit: r1788084 - /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/ExternalChange.java

Author: mreutegg
Date: Wed Mar 22 10:34:05 2017
New Revision: 1788084

URL: http://svn.apache.org/viewvc?rev=1788084&view=rev
Log:
OAK-5964: Invalidate documents through journal

Create ChangeSetBuilder whenever process() is called

Modified:
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/ExternalChange.java

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/ExternalChange.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/ExternalChange.java?rev=1788084&r1=1788083&r2=1788084&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/ExternalChange.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/ExternalChange.java Wed Mar 22 10:34:05 2017
@@ -50,15 +50,13 @@ abstract class ExternalChange {
 
     protected final BackgroundReadStats stats;
 
-    private final ChangeSetBuilder changeSetBuilder;
+    private ChangeSetBuilder changeSetBuilder;
 
     private final JournalPropertyHandler journalPropertyHandler;
 
     ExternalChange(DocumentNodeStore store) {
         this.store = store;
         this.stats = new BackgroundReadStats();
-        this.changeSetBuilder = new ChangeSetBuilder(
-                store.getChangeSetMaxItems(), store.getChangeSetMaxDepth());
         this.journalPropertyHandler = store.getJournalPropertyHandlerFactory().newHandler();
     }
 
@@ -112,6 +110,8 @@ abstract class ExternalChange {
 
         Map<Integer, Revision> lastRevMap = doc.getLastRev();
         try {
+            changeSetBuilder = new ChangeSetBuilder(
+                    store.getChangeSetMaxItems(), store.getChangeSetMaxDepth());
             RevisionVector headRevision = store.getHeadRevision();
             Set<Revision> externalChanges = newHashSet();
             for (Map.Entry<Integer, Revision> e : lastRevMap.entrySet()) {