Merge pull request #146 from dcm4che/dcm4chee-arc-light#893

AuditSuppressCriteria.match() does not consider Active Participant
dcm4che · Aug 2, 2017 · ad5e85e · ad5e85e
2 parents 257897d + fd889c0
commit ad5e85e
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/dcm4che-net-audit/src/main/java/org/dcm4che3/net/audit/AuditSuppressCriteria.java b/dcm4che-net-audit/src/main/java/org/dcm4che3/net/audit/AuditSuppressCriteria.java
@@ -380,7 +380,7 @@ && equals(eventTypeCode.getCodeSystemName(), o.getCodeSystemName()))
     }
 
     private boolean match(List<ActiveParticipant> aps) {
-        if (!containsActiveParticipantCriteria())
+        if (matchAnyActiveParticipant())
             return true;
 
         for (ActiveParticipant ap : aps) {
@@ -424,7 +424,7 @@ && equals(roleIDCode.getCodeSystemName(), o.getCodeSystemName()))
         return false;
     }
 
-    public boolean containsActiveParticipantCriteria() {
+    private boolean matchAnyActiveParticipant() {
         return userIDs.length == 0
                 && alternativeUserIDs.length == 0
                 && roleIDCodes.length == 0