hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-07 01:54:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed NPE on item retrieving

Browse Source
This commit is contained in:
Davide Negretti
2021-09-14 16:21:33 +02:00
parent 75b6acc9f3
commit 1a5b7475f4
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/VersionHistoryDraftVersionLinkRepository.java
View File

@@ -65,13 +65,15 @@ public class VersionHistoryDraftVersionLinkRepository extends AbstractDSpaceRest
}
Version oldestVersion = versionHistoryService.getLatestVersion(context, versionHistory);
WorkflowItem workflowItem = workflowItemService.findByItem(context, oldestVersion.getItem());
WorkspaceItem workspaceItem = workspaceItemService.findByItem(context, oldestVersion.getItem());
if (Objects.nonNull(workflowItem)) {
return converter.toRest(workflowItem, projection);
}
if (Objects.nonNull(workspaceItem)) {
return converter.toRest(workspaceItem, projection);
if(Objects.nonNull(oldestVersion) && Objects.nonNull(oldestVersion.getItem())) {
WorkflowItem workflowItem = workflowItemService.findByItem(context, oldestVersion.getItem());
WorkspaceItem workspaceItem = workspaceItemService.findByItem(context, oldestVersion.getItem());
if (Objects.nonNull(workflowItem)) {
return converter.toRest(workflowItem, projection);
}
if (Objects.nonNull(workspaceItem)) {
return converter.toRest(workspaceItem, projection);
}
}
return null;
}