From 30422e0cb8fd5e698612e009fa52afc86563c6eb Mon Sep 17 00:00:00 2001 From: Ishank Arora Date: Fri, 2 Oct 2020 17:15:59 +0200 Subject: [PATCH] Fix bug in eosfs --- changelog/unreleased/ref-errors.md | 1 + pkg/storage/utils/eosfs/eosfs.go | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/changelog/unreleased/ref-errors.md b/changelog/unreleased/ref-errors.md index 6f0e337459..5122d10cd4 100644 --- a/changelog/unreleased/ref-errors.md +++ b/changelog/unreleased/ref-errors.md @@ -1,3 +1,4 @@ Bugfix: Add error handling for invalid references https://github.com/cs3org/reva/pull/1216 +https://github.com/cs3org/reva/pull/1218 diff --git a/pkg/storage/utils/eosfs/eosfs.go b/pkg/storage/utils/eosfs/eosfs.go index 26cfe11502..b2865c2411 100644 --- a/pkg/storage/utils/eosfs/eosfs.go +++ b/pkg/storage/utils/eosfs/eosfs.go @@ -684,7 +684,7 @@ func (fs *eosfs) listWithNominalHome(ctx context.Context, p string) (finfos []*p } } - if finfo, err := fs.convertToResourceInfo(ctx, eosFileInfo); err != nil { + if finfo, err := fs.convertToResourceInfo(ctx, eosFileInfo); err == nil { finfos = append(finfos, finfo) } } @@ -742,7 +742,7 @@ func (fs *eosfs) listHome(ctx context.Context, home string) ([]*provider.Resourc } } - if finfo, err := fs.convertToResourceInfo(ctx, eosFileInfo); err != nil { + if finfo, err := fs.convertToResourceInfo(ctx, eosFileInfo); err == nil { finfos = append(finfos, finfo) } } @@ -778,7 +778,7 @@ func (fs *eosfs) listShareFolderRoot(ctx context.Context, p string) (finfos []*p } } - if finfo, err := fs.convertToFileReference(ctx, eosFileInfo); err != nil { + if finfo, err := fs.convertToFileReference(ctx, eosFileInfo); err == nil { finfos = append(finfos, finfo) } } @@ -1191,7 +1191,7 @@ func (fs *eosfs) ListRevisions(ctx context.Context, ref *provider.Reference) ([] } revisions := []*provider.FileVersion{} for _, eosRev := range eosRevisions { - if rev, err := fs.convertToRevision(ctx, eosRev); err != nil { + if rev, err := fs.convertToRevision(ctx, eosRev); err == nil { revisions = append(revisions, rev) } } @@ -1291,7 +1291,7 @@ func (fs *eosfs) ListRecycle(ctx context.Context) ([]*provider.RecycleItem, erro } } - if recycleItem, err := fs.convertToRecycleItem(ctx, entry); err != nil { + if recycleItem, err := fs.convertToRecycleItem(ctx, entry); err == nil { recycleEntries = append(recycleEntries, recycleItem) } }