Merge pull request #4140 from kobergj/FixMissingEtagOnShareJail

Fix missing etag in shares jail
cs3org · Aug 31, 2023 · cb0897d · cb0897d
2 parents 8ba013d + a733b6f
commit cb0897d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/changelog/unreleased/fix-missing-sharesjail-etag.md b/changelog/unreleased/fix-missing-sharesjail-etag.md
@@ -0,0 +1,5 @@
+Bugfix: Fix missing etag in shares jail
+
+The shares jail can miss the etag if the first `receivedShare` is not accepted.
+
+https://github.com/cs3org/reva/pull/4140
diff --git a/internal/grpc/services/sharesstorageprovider/sharesstorageprovider.go b/internal/grpc/services/sharesstorageprovider/sharesstorageprovider.go
@@ -1167,7 +1167,7 @@ func findEarliestShare(receivedShares []*collaboration.ReceivedShare, shareInfo
 		}
 
 		switch {
-		case earliestShare == nil:
+		case earliestShare == nil && hasCurrentMd:
 			earliestShare = current
 		// ignore if one of the shares has no metadata
 		case !hasEarliestMd || !hasCurrentMd: