commit d0ed440513802199789da8e3058308a068b4a38d
author Jean-Baptiste Onofré <jbonofre@apache.org> Mon Jun 29 15:53:04 2020 +0200
committer GitHub <noreply@github.com> Mon Jun 29 15:53:04 2020 +0200
tree 13897f95ab4606f202b98b687536a1962e702c5c
parent 20415daaabc475b7b23f8c38802e860300e2ab95
parent 0e6c2a928790cc89d135167f6ed68ae64dd20c2a

Merge pull request #70 from Jahia/blacklist-optimization

Slightly optimized code for group configuration

core/src/main/java/org/apache/karaf/cellar/core/CellarSupport.java

diff --git a/core/src/main/java/org/apache/karaf/cellar/core/CellarSupport.java b/core/src/main/java/org/apache/karaf/cellar/core/CellarSupport.java
index a1d0f3c..965e09c 100644
--- a/core/src/main/java/org/apache/karaf/cellar/core/CellarSupport.java
+++ b/core/src/main/java/org/apache/karaf/cellar/core/CellarSupport.java
@@ -172,7 +172,6 @@
      * @param type the event type (inbound, outbound).
      */
     public Boolean isAllowed(Group group, String category, String event, EventType type) {
-        Boolean result = true;
         Set<String> whiteList = getListEntries(Configurations.WHITELIST, group, category, type);
         Set<String> blackList = getListEntries(Configurations.BLACKLIST, group, category, type);
 
@@ -183,21 +182,23 @@
         }
 
         // if no white listed items we assume all are accepted.
+        Boolean result = true;
         if (!whiteList.isEmpty()) {
             result = false;
             for (String whiteListItem : whiteList) {
-                if (wildCardMatch(event, whiteListItem))
+                if (wildCardMatch(event, whiteListItem)) {
                     result = true;
+                    break;
+                }
             }
         }
 
         if (result) {
+            // we passed whitelist, now check the blacklist
             // if any blackList item matched, then false is returned.
-            if (!blackList.isEmpty()) {
-                for (String blackListItem : blackList) {
-                    if (wildCardMatch(event, blackListItem)) {
-                        return false;
-                    }
+            for (String blackListItem : blackList) {
+                if (wildCardMatch(event, blackListItem)) {
+                    return false;
                 }
             }
         }