Author: chetanm
Date: Mon Jul 10 12:21:07 2017
New Revision: 1801453
URL: http://svn.apache.org/viewvc?rev=1801453&view=rev
Log:
OAK-6271 - Support for importing index files
Handle revert when async is a mvp which result in previous being an mvp
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/importer/AsyncLaneSwitcher.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/importer/AsyncLaneSwitcherTest.java
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/importer/AsyncLaneSwitcher.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/importer/AsyncLaneSwitcher.java?rev=1801453&r1=1801452&r2=1801453&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/importer/AsyncLaneSwitcher.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/importer/AsyncLaneSwitcher.java
Mon Jul 10 12:21:07 2017
@@ -85,7 +85,7 @@ public class AsyncLaneSwitcher {
PropertyState previousAsync = idxBuilder.getProperty(ASYNC_PREVIOUS);
checkState(previousAsync != null, "No previous async state property
found for index [%s]", indexPath);
- if (ASYNC_PREVIOUS_NONE.equals(previousAsync.getValue(Type.STRING))) {
+ if (!previousAsync.isArray() &&
ASYNC_PREVIOUS_NONE.equals(previousAsync.getValue(Type.STRING))) {
idxBuilder.removeProperty(IndexConstants.ASYNC_PROPERTY_NAME);
} else {
idxBuilder.setProperty(clone(IndexConstants.ASYNC_PROPERTY_NAME,
previousAsync));
Modified:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/importer/AsyncLaneSwitcherTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/importer/AsyncLaneSwitcherTest.java?rev=1801453&r1=1801452&r2=1801453&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/importer/AsyncLaneSwitcherTest.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/importer/AsyncLaneSwitcherTest.java
Mon Jul 10 12:21:07 2017
@@ -101,4 +101,12 @@ public class AsyncLaneSwitcherTest {
assertNull(builder.getProperty(ASYNC_PROPERTY_NAME));
}
+ @Test
+ public void switchAndRevertMulti() throws Exception{
+ builder.setProperty(ASYNC_PROPERTY_NAME, asList("async", "nrt"),
Type.STRINGS);
+
+ AsyncLaneSwitcher.switchLane(builder, "foo");
+ AsyncLaneSwitcher.revertSwitch(builder, "foo");
+ }
+
}
\ No newline at end of file
