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

[CST-12744] fixes for NPE & unauthorized

Browse Source
This commit is contained in:
Stefano Maffei
2023-11-24 14:20:15 +01:00
parent 42bfef065a
commit fd762f1133
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
dspace-api/src/main/java/org/dspace/app/ldn/service/impl/LDNMessageServiceImpl.java
View File

@@ -193,11 +193,13 @@ public class LDNMessageServiceImpl implements LDNMessageService {
LDNProcessor processor = null; LDNProcessor processor = null;
for (int i = 0; processor == null && i < msgs.size() && msgs.get(i) != null; i++) { for (int i = 0; processor == null && i < msgs.size() && msgs.get(i) != null; i++) {
processor = ldnRouter.route(msgs.get(i)); processor = ldnRouter.route(msgs.get(i));
msg = msgs.get(i);
if (processor == null) { if (processor == null) {
log.info( log.info(
"No processor found for LDN message " + msgs.get(i)); "No processor found for LDN message " + msgs.get(i));
} else { msg.setQueueStatus(LDNMessageEntity.QUEUE_STATUS_UNMAPPED_ACTION);
msg = msgs.get(i); msg.setQueueAttempts(msg.getQueueAttempts() + 1);
update(context, msg);
} }
} }
if (processor != null) { if (processor != null) {
@@ -223,9 +225,6 @@ public class LDNMessageServiceImpl implements LDNMessageService {
} }
} else { } else {
log.info("Found x" + msgs.size() + " LDN messages but none processor found."); log.info("Found x" + msgs.size() + " LDN messages but none processor found.");
msg.setQueueStatus(LDNMessageEntity.QUEUE_STATUS_UNMAPPED_ACTION);
msg.setQueueAttempts(msg.getQueueAttempts() + 1);
update(context, msg);
} }
} }
} catch (SQLException e) { } catch (SQLException e) {
@@ -291,8 +290,8 @@ public class LDNMessageServiceImpl implements LDNMessageService {
if (msgs != null && !msgs.isEmpty()) { if (msgs != null && !msgs.isEmpty()) {
for (LDNMessageEntity msg : msgs) { for (LDNMessageEntity msg : msgs) {
RequestStatus offer = new RequestStatus(); RequestStatus offer = new RequestStatus();
offer.setServiceName(msg.getTarget().getName()); offer.setServiceName(msg.getTarget() == null ? "Unknown Service" : msg.getTarget().getName());
offer.setServiceUrl(msg.getTarget().getLdnUrl()); offer.setServiceUrl(msg.getTarget() == null ? "" : msg.getTarget().getLdnUrl());
List<LDNMessageEntity> acks = ldnMessageDao.findAllRelatedMessagesByItem( List<LDNMessageEntity> acks = ldnMessageDao.findAllRelatedMessagesByItem(
context, msg, item, "Accept", "TentativeReject", "TentativeAccept", "Announce"); context, msg, item, "Accept", "TentativeReject", "TentativeAccept", "Announce");
if (acks == null || acks.isEmpty()) { if (acks == null || acks.isEmpty()) {

3
dspace-api/src/main/java/org/dspace/qaevent/service/impl/QAEventActionServiceImpl.java
View File

@@ -84,12 +84,15 @@ public class QAEventActionServiceImpl implements QAEventActionService {
log.error(msg); log.error(msg);
throw new RuntimeException(msg); throw new RuntimeException(msg);
} }
context.turnOffAuthorisationSystem();
topicsToActions.get(qaevent.getTopic()).applyCorrection(context, item, related, topicsToActions.get(qaevent.getTopic()).applyCorrection(context, item, related,
jsonMapper.readValue(qaevent.getMessage(), qaevent.getMessageDtoClass())); jsonMapper.readValue(qaevent.getMessage(), qaevent.getMessageDtoClass()));
qaEventService.deleteEventByEventId(qaevent.getEventId()); qaEventService.deleteEventByEventId(qaevent.getEventId());
makeAcknowledgement(qaevent.getEventId(), qaevent.getSource(), QAEvent.ACCEPTED); makeAcknowledgement(qaevent.getEventId(), qaevent.getSource(), QAEvent.ACCEPTED);
} catch (SQLException | JsonProcessingException e) { } catch (SQLException | JsonProcessingException e) {
throw new RuntimeException(e); throw new RuntimeException(e);
} finally {
context.restoreAuthSystemState();
} }
} }