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 al...@apache.org on 2015/06/25 17:22:33 UTC
svn commit: r1687553 -
/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/reference/ReferenceEditor.java
Author: alexparvulescu
Date: Thu Jun 25 15:22:33 2015
New Revision: 1687553
URL: http://svn.apache.org/r1687553
Log:
OAK-3035 ReferenceEditor reindex detection broken
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/reference/ReferenceEditor.java
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/reference/ReferenceEditor.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/reference/ReferenceEditor.java?rev=1687553&r1=1687552&r2=1687553&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/reference/ReferenceEditor.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/reference/ReferenceEditor.java Thu Jun 25 15:22:33 2015
@@ -120,7 +120,7 @@ class ReferenceEditor extends DefaultEdi
* flag marking a reindex, case in which we don't need to keep track of the
* newIds set
*/
- private final boolean isReindex;
+ private boolean isReindex;
public ReferenceEditor(NodeBuilder definition, NodeState root) {
this.parent = null;
@@ -137,7 +137,6 @@ class ReferenceEditor extends DefaultEdi
this.discardedIds = newHashSet();
this.versionStoreIds = newHashSet();
this.newIds = newHashSet();
- this.isReindex = MISSING_NODE == root;
}
private ReferenceEditor(ReferenceEditor parent, String name, String uuid) {
@@ -171,6 +170,9 @@ class ReferenceEditor extends DefaultEdi
@Override
public void enter(NodeState before, NodeState after)
throws CommitFailedException {
+ if (MISSING_NODE == before && parent == null) {
+ isReindex = true;
+ }
}
@Override