Merge pull request #10571 from GlobalDataverseCommunityConsortium/confirmemailfix

Test fix for confirmEmail test failure

Author: landreev

src/main/java/edu/harvard/iq/dataverse/search/SearchIncludeFragment.java

@@ -1495,7 +1495,15 @@ private DataverseRequest getDataverseRequest() {
     }
 
     public boolean isValid(SolrSearchResult result) {
-        return result.isValid(x -> permissionsWrapper.canUpdateDataset(getDataverseRequest(), datasetService.find(x.getEntityId())));
+        return result.isValid(x -> {
+            Long id = x.getEntityId();
+            DvObject obj = dvObjectService.findDvObject(id);
+            if(obj != null && obj instanceof Dataset) {
+                return permissionsWrapper.canUpdateDataset(getDataverseRequest(), (Dataset) obj);
+            }
+            logger.fine("isValid called for dvObject that is null (or not a dataset), id: " + id + "This can occur if a dataset is deleted while a search is in progress");
+            return true;
+        });
     }
 
     public enum SortOrder {