Fix #373 dcm4che/dcm4chee-arc-light : Audit message is not generated …

…for event 'Instances Stored' when previously rejected instances with 'Retention Expired' reason are stored again in archive
dcm4che · Sep 15, 2016 · f3973ab · f3973ab
1 parent bb76e59
commit f3973ab
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/dcm4chee-arc-audit/src/main/java/org/dcm4chee/arc/audit/AuditServiceUtils.java b/dcm4chee-arc-audit/src/main/java/org/dcm4chee/arc/audit/AuditServiceUtils.java
@@ -165,7 +165,7 @@ static EventType forQuery(QueryContext ctx) {
  static EventType forInstanceStored(StoreContext ctx) {
  return !ctx.getLocations().isEmpty()
  ? ctx.getPreviousInstance() != null ? STORE_UPDT : STORE_CREA
- : null;
+ : ctx.getStoredInstance() != null ? STORE_CREA : null;
  }
 
  static HashSet<EventType> forBeginTransfer(RetrieveContext ctx) {

diff --git a/dcm4chee-arc-audit/src/main/java/org/dcm4chee/arc/audit/AuditTriggerObserver.java b/dcm4chee-arc-audit/src/main/java/org/dcm4chee/arc/audit/AuditTriggerObserver.java
@@ -95,7 +95,7 @@ public void onStore(@Observes StoreContext ctx) {
  if (auditService.isAuditInstalled()) {
  if (ctx.getRejectionNote() != null)
  auditService.spoolInstancesDeleted(ctx);
- else if (!ctx.getLocations().isEmpty() || ctx.getException() != null)
+ else if (ctx.getStoredInstance() != null || ctx.getException() != null)
  auditService.spoolInstanceStoredOrWadoRetrieve(ctx, null);
  }
  }