From 40b605712d2ed8ea67c667b7af901bf2b3d6d1f8 Mon Sep 17 00:00:00 2001 From: ashmrtn Date: Wed, 12 Apr 2023 12:41:47 -0700 Subject: [PATCH] Fix NPE panic (#3109) Failing [test](https://github.com/alcionai/corso/actions/runs/4681548110/jobs/8294288107?pr=3107#step:7:879) #### Does this PR need a docs update or release note? - [ ] :white_check_mark: Yes, it's included - [ ] :clock1: Yes, but in a later PR - [x] :no_entry: No #### Type of change - [ ] :sunflower: Feature - [x] :bug: Bugfix - [ ] :world_map: Documentation - [ ] :robot: Supportability/Tests - [ ] :computer: CI/Deployment - [ ] :broom: Tech Debt/Cleanup #### Issue(s) * closes #3108 #### Test Plan - [x] :muscle: Manual - [ ] :zap: Unit test - [ ] :green_heart: E2E --- src/internal/operations/backup.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/internal/operations/backup.go b/src/internal/operations/backup.go index d81827392..93006dacf 100644 --- a/src/internal/operations/backup.go +++ b/src/internal/operations/backup.go @@ -526,7 +526,7 @@ func mergeDetails( errs *fault.Bus, ) error { // Don't bother loading any of the base details if there's nothing we need to merge. - if dataFromBackup.ItemsToMerge() == 0 { + if dataFromBackup == nil || dataFromBackup.ItemsToMerge() == 0 { return nil }