Merge pull request #14542 from iterate-ch/bugfix/GH-14527

Fix #14527.

Author: ylangisc

backblaze/src/main/java/ch/cyberduck/core/b2/B2AttributesFinderFeature.java

@@ -91,21 +91,16 @@ public PathAttributes find(final Path file, final ListProgressListener listener)
             }
         }
         else {
-
             final String id = fileid.getVersionId(file);
+            B2FileResponse response;
             try {
-                return this.findFileInfo(file, id);
+                response = this.findFileInfo(file, id);
             }
             catch(NotfoundException e) {
                 // Try with reset cache after failure finding node id
-                return this.findFileInfo(file, fileid.getVersionId(file));
+                response = this.findFileInfo(file, fileid.getVersionId(file));
             }
-        }
-    }
-
-    private PathAttributes findFileInfo(final Path file, final String id) throws BackgroundException {
-        try {
-            final PathAttributes attr = this.toAttributes(session.getClient().getFileInfo(id));
+            final PathAttributes attr = this.toAttributes(response);
             if(attr.isDuplicate()) {
                 // Throw failure if latest version has hide marker set and lookup was without explicit version
                 if(StringUtils.isBlank(file.attributes().getVersionId())) {
@@ -117,6 +112,12 @@ private PathAttributes findFileInfo(final Path file, final String id) throws Bac
             }
             return attr;
         }
+    }
+
+    private B2FileResponse findFileInfo(final Path file, final String id) throws BackgroundException {
+        try {
+            return session.getClient().getFileInfo(id);
+        }
         catch(B2ApiException e) {
             throw new B2ExceptionMappingService(fileid).map("Failure to read attributes of {0}", e, file);
         }

backblaze/src/main/java/ch/cyberduck/core/b2/B2ObjectListService.java

@@ -37,7 +37,6 @@
 import java.util.EnumSet;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.stream.Collectors;
 
 import synapticloop.b2.Action;
 import synapticloop.b2.exception.B2ApiException;
@@ -133,8 +132,12 @@ private Marker parse(final Path directory, final AttributedList<Path> objects,
                 final Path placeholder = new Path(directory.isDirectory() ? directory : directory.getParent(),
                         PathNormalizer.name(StringUtils.chomp(info.getFileName(), String.valueOf(Path.DELIMITER))),
                         EnumSet.of(Path.Type.directory, Path.Type.placeholder));
-                // Need to check if only hidden files inside
-                if(this.list(placeholder, new DisabledListProgressListener()).toStream().filter(f -> !f.attributes().isDuplicate()).collect(Collectors.toList()).isEmpty()) {
+                // Read .bzEmpty
+                try {
+                    placeholder.withAttributes(attr.find(placeholder, new DisabledListProgressListener()));
+                }
+                catch(NotfoundException e) {
+                    // No placeholder object or hidden flag set
                     placeholder.attributes().setDuplicate(true);
                 }
                 objects.add(placeholder);