svn commit: r1768637 - in /jackrabbit/oak/trunk/oak-core/src: main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/OakFileDataStore.java test/java/org/apache/jackrabbit/oak/plugins/blob/datastore/OakFileDataStoreTest.java

[amitj]

Author: amitj
Date: Tue Nov  8 07:51:16 2016
New Revision: 1768637

URL: http://svn.apache.org/viewvc?rev=1768637&view=rev
Log:
OAK-5078: Improper handling of relative paths in 
OakFileDataStore#getAllIdentifiers

Fixed by normalizing the path using the File.getAbsolutePath

Modified:
    
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/OakFileDataStore.java
    
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/blob/datastore/OakFileDataStoreTest.java

Modified: 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/OakFileDataStore.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/OakFileDataStore.java?rev=1768637&r1=1768636&r2=1768637&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/OakFileDataStore.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/OakFileDataStore.java
 Tue Nov  8 07:51:16 2016
@@ -69,13 +69,13 @@ public class OakFileDataStore extends Fi
 
     @Override
     public Iterator<DataIdentifier> getAllIdentifiers() {
-        final String path = normalizeNoEndSeparator(getPath());
-        return Files.fileTreeTraverser().postOrderTraversal(new 
File(getPath()))
+        final String path = normalizeNoEndSeparator(new 
File(getPath()).getAbsolutePath());
+        return Files.fileTreeTraverser().postOrderTraversal(new File(path))
                 .filter(new Predicate<File>() {
                     @Override
                     public boolean apply(File input) {
                         return input.isFile() &&
-                            
!normalizeNoEndSeparator(input.getParent()).equals(path);
+                            !input.getParent().equals(path);
                     }
                 })
                 .transform(new Function<File, DataIdentifier>() {
@@ -232,14 +232,14 @@ public class OakFileDataStore extends Fi
 
     @Override
     public Iterator<DataRecord> getAllRecords() {
-        final String path = normalizeNoEndSeparator(getPath());
+        final String path = normalizeNoEndSeparator(new 
File(getPath()).getAbsolutePath());
         final OakFileDataStore store = this;
-        return Files.fileTreeTraverser().postOrderTraversal(new 
File(getPath()))
+        return Files.fileTreeTraverser().postOrderTraversal(new File(path))
             .filter(new Predicate<File>() {
                 @Override
                 public boolean apply(File input) {
                     return input.isFile() &&
-                        
!normalizeNoEndSeparator(input.getParent()).equals(path);
+                        !input.getParent().equals(path);
                 }
             })
             .transform(new Function<File, DataRecord>() {

Modified: 
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/blob/datastore/OakFileDataStoreTest.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/blob/datastore/OakFileDataStoreTest.java?rev=1768637&r1=1768636&r2=1768637&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/blob/datastore/OakFileDataStoreTest.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/blob/datastore/OakFileDataStoreTest.java
 Tue Nov  8 07:51:16 2016
@@ -30,6 +30,7 @@ import com.google.common.base.Function;
 import com.google.common.collect.Iterators;
 import com.google.common.collect.Sets;
 import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.FilenameUtils;
 import org.apache.jackrabbit.core.data.DataIdentifier;
 import org.apache.jackrabbit.core.data.FileDataStore;
 import org.junit.Test;
@@ -40,15 +41,32 @@ import static org.junit.Assert.assertTru
 public class OakFileDataStoreTest {
 
     @Test
+    public void testGetAllIdentifiersRelative1() throws Exception {
+        File f = new File("./target/oak-fds-test1");
+        testGetAllIdentifiers(f.getAbsolutePath(), f.getPath());
+    }
+
+    @Test
+    public void testGetAllIdentifiersRelative2() throws Exception {
+        File f = new File("./target", "/fds/../oak-fds-test2");
+        testGetAllIdentifiers(FilenameUtils.normalize(f.getAbsolutePath()), 
f.getPath());
+    }
+
+    @Test
     public void testGetAllIdentifiers() throws Exception {
-        File testDir = new File("./target", "oak-fds-test");
+        File f = new File("./target", "oak-fds-test3");
+        testGetAllIdentifiers(f.getAbsolutePath(), f.getPath());
+    }
+
+    private void testGetAllIdentifiers(String path, String unnormalizedPath) 
throws Exception {
+        File testDir = new File(path);
         FileUtils.touch(new File(testDir, "ab/cd/ef/abcdef"));
         FileUtils.touch(new File(testDir, "bc/de/fg/bcdefg"));
         FileUtils.touch(new File(testDir, "cd/ef/gh/cdefgh"));
         FileUtils.touch(new File(testDir, "c"));
 
         FileDataStore fds = new OakFileDataStore();
-        fds.setPath(testDir.getAbsolutePath());
+        fds.setPath(unnormalizedPath);
         fds.init(null);
 
         Iterator<DataIdentifier> dis = fds.getAllIdentifiers();