Author: mreutegg
Date: Tue Jun 28 10:07:48 2016
New Revision: 1750462
URL: http://svn.apache.org/viewvc?rev=1750462&view=rev
Log:
OAK-4503: Update count increases with rebase
Commit fix and enable test
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentRootBuilder.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/UpdateLimitTest.java
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentRootBuilder.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentRootBuilder.java?rev=1750462&r1=1750461&r2=1750462&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentRootBuilder.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentRootBuilder.java
Tue Jun 28 10:07:48 2016
@@ -130,6 +130,7 @@ class DocumentRootBuilder extends Abstra
// Rebase in memory changes on top of the head of the rebased branch
super.reset(branch.getHead());
+ updates = 0;
head.compareAgainstBaseState(inMemBase, new
ConflictAnnotatingRebaseDiff(this));
// Set new base and return rebased head
Modified:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/UpdateLimitTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/UpdateLimitTest.java?rev=1750462&r1=1750461&r2=1750462&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/UpdateLimitTest.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/UpdateLimitTest.java
Tue Jun 28 10:07:48 2016
@@ -19,13 +19,11 @@ package org.apache.jackrabbit.oak.plugin
import org.apache.jackrabbit.oak.plugins.document.util.Utils;
import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
import org.junit.Before;
-import org.junit.Ignore;
import org.junit.Rule;
import org.junit.Test;
import static org.junit.Assert.assertNull;
-@Ignore
public class UpdateLimitTest {
@Rule
