Author: tomekr
Date: Wed Apr 11 08:12:00 2018
New Revision: 1828874

URL: http://svn.apache.org/viewvc?rev=1828874&view=rev
Log:
OAK-7398: SegmentArchiveManager#listArchives should only return tar files

- updated javadoc for the listArchives() method
- updated the Azure implementation

Modified:
    
jackrabbit/oak/trunk/oak-segment-azure/src/main/java/org/apache/jackrabbit/oak/segment/azure/AzureArchiveManager.java
    
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/spi/persistence/SegmentArchiveManager.java

Modified: 
jackrabbit/oak/trunk/oak-segment-azure/src/main/java/org/apache/jackrabbit/oak/segment/azure/AzureArchiveManager.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-azure/src/main/java/org/apache/jackrabbit/oak/segment/azure/AzureArchiveManager.java?rev=1828874&r1=1828873&r2=1828874&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-segment-azure/src/main/java/org/apache/jackrabbit/oak/segment/azure/AzureArchiveManager.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-segment-azure/src/main/java/org/apache/jackrabbit/oak/segment/azure/AzureArchiveManager.java
 Wed Apr 11 08:12:00 2018
@@ -73,6 +73,7 @@ public class AzureArchiveManager impleme
                     .spliterator(), false)
                     .filter(i -> i instanceof CloudBlobDirectory)
                     .map(i -> (CloudBlobDirectory) i)
+                    .filter(i -> getName(i).endsWith(".tar"))
                     .map(CloudBlobDirectory::getPrefix)
                     .map(Paths::get)
                     .map(Path::getFileName)

Modified: 
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/spi/persistence/SegmentArchiveManager.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/spi/persistence/SegmentArchiveManager.java?rev=1828874&r1=1828873&r2=1828874&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/spi/persistence/SegmentArchiveManager.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/spi/persistence/SegmentArchiveManager.java
 Wed Apr 11 08:12:00 2018
@@ -36,7 +36,7 @@ import java.util.UUID;
 public interface SegmentArchiveManager {
 
     /**
-     * List names of the available archives.
+     * List names of the available .tar archives.
      *
      * @return archive list
      */


Reply via email to