Commit 7db753d0 authored by nfcalabria's avatar nfcalabria
Browse files

Minor fix

parent 071f849d
Loading
Loading
Loading
Loading
+33 −29
Original line number Diff line number Diff line
@@ -134,8 +134,8 @@ public class ArchiveService {
        // it will be initialized only when necessary
        Map<Integer, String> portalLocationUrls = null;

        List<ArchiveEntryDescriptor> noTargetEntryDescriptors = 
                entryDescriptors.stream().filter(ed -> !ed.isPointingToAnotherNode())
        List<ArchiveEntryDescriptor> noTargetEntryDescriptors
                = entryDescriptors.stream().filter(ed -> !ed.isPointingToAnotherNode())
                        .collect(Collectors.toList());

        // Start with archive entry descriptors which don't point to another node
@@ -153,8 +153,8 @@ public class ArchiveService {
            }
        }

        List<ArchiveEntryDescriptor> pointingEntryDescriptors = 
                entryDescriptors.stream().filter(ed -> ed.isPointingToAnotherNode())
        List<ArchiveEntryDescriptor> pointingEntryDescriptors
                = entryDescriptors.stream().filter(ed -> ed.isPointingToAnotherNode())
                        .collect(Collectors.toList());

        // Now archive entry descriptors pointing to another node
@@ -191,11 +191,15 @@ public class ArchiveService {
            return;
        }

        // I expect only external links
        // I retrieve only external links
        // local links have been resolved before calling this endpoint
        // TODO: we need to discuss about internal links in container nodes
        if (fileInfo.isLink()) {
            String target = fileInfo.getTarget();
            if (!target.startsWith("vos://")) {
                downloadExternalLinkIntoArchive(fileInfo, relPath,
                        tokenPrincipal, handler, servletRequest);
            }
            return;
        }