Skip to content

Commit 2bf05c1

Browse files
authored
Merge pull request #10571 from GlobalDataverseCommunityConsortium/confirmemailfix
Test fix for confirmEmail test failure
2 parents 9c64eba + 788b046 commit 2bf05c1

1 file changed

Lines changed: 9 additions & 1 deletion

File tree

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

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1495,7 +1495,15 @@ private DataverseRequest getDataverseRequest() {
14951495
}
14961496

14971497
public boolean isValid(SolrSearchResult result) {
1498-
return result.isValid(x -> permissionsWrapper.canUpdateDataset(getDataverseRequest(), datasetService.find(x.getEntityId())));
1498+
return result.isValid(x -> {
1499+
Long id = x.getEntityId();
1500+
DvObject obj = dvObjectService.findDvObject(id);
1501+
if(obj != null && obj instanceof Dataset) {
1502+
return permissionsWrapper.canUpdateDataset(getDataverseRequest(), (Dataset) obj);
1503+
}
1504+
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");
1505+
return true;
1506+
});
14991507
}
15001508

15011509
public enum SortOrder {

0 commit comments

Comments
 (0)