svn commit: r1802236 - /jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/index/IndexCommand.java

[chetanm]

Author: chetanm
Date: Tue Jul 18 05:09:03 2017
New Revision: 1802236

URL: http://svn.apache.org/viewvc?rev=1802236&view=rev
Log:
OAK-6271 - Support for importing index files

Do not clean the output directory if it contains the import directory

Modified:
    
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/index/IndexCommand.java

Modified: 
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/index/IndexCommand.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/index/IndexCommand.java?rev=1802236&r1=1802235&r2=1802236&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/index/IndexCommand.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/index/IndexCommand.java
 Tue Jul 18 05:09:03 2017
@@ -249,7 +249,12 @@ public class IndexCommand implements Com
 
     private static void setupDirectories(IndexOptions indexOpts) throws 
IOException {
         if (indexOpts.getOutDir().exists()) {
-            FileUtils.cleanDirectory(indexOpts.getOutDir());
+            if (indexOpts.isImportIndex() &&
+                    FileUtils.directoryContains(indexOpts.getOutDir(), 
indexOpts.getIndexImportDir())) {
+                //Do not clean directory in this case
+            } else {
+                FileUtils.cleanDirectory(indexOpts.getOutDir());
+            }
         }
         cleanWorkDir(indexOpts.getWorkDir());
     }