1 files changed, 26 insertions, 8 deletions
diff --git a/services/services-engine/src/main/java/org/onap/policy/apex/service/engine/main/ApexEventUnmarshaller.java b/services/services-engine/src/main/java/org/onap/policy/apex/service/engine/main/ApexEventUnmarshaller.java
index 1d1b64e37..97aa25fbe 100644
--- a/services/services-engine/src/main/java/org/onap/policy/apex/service/engine/main/ApexEventUnmarshaller.java
+++ b/services/services-engine/src/main/java/org/onap/policy/apex/service/engine/main/ApexEventUnmarshaller.java
@@ -216,15 +216,10 @@ public class ApexEventUnmarshaller implements ApexEventReceiver, Runnable {
         try {
             final List<ApexEvent> apexEventList = converter.toApexEvent(consumerParameters.getEventName(), event);
             for (final ApexEvent apexEvent : apexEventList) {
-                // Check if we are filtering events on this unmarshaler, if so check the event name
-                // against the filter
-                if (consumerParameters.isSetEventNameFilter()
-                                && !apexEvent.getName().matches(consumerParameters.getEventNameFilter())) {
-                    if (LOGGER.isTraceEnabled()) {
-                        LOGGER.trace("onMessage(): event {} not processed, filtered  out by filter", apexEvent,
-                                        consumerParameters.getEventNameFilter());
-                    }
+                isEventFilteredOut(apexEvent);
 
+                // Check if this event is filtered out by the incoming filter
+                if (isEventFilteredOut(apexEvent)) {
                     // Ignore this event
                     continue;
                 }
@@ -252,6 +247,29 @@ public class ApexEventUnmarshaller implements ApexEventReceiver, Runnable {
     }
 
     /**
+     * Check if an event is filtered out and ignored.
+     * 
+     * @param apexEvent the event to check
+     */
+    private boolean isEventFilteredOut(final ApexEvent apexEvent) {
+        // Check if we are filtering events on this unmarshaler, if so check the event name
+        // against the filter
+        if (consumerParameters.isSetEventNameFilter()
+                        && !apexEvent.getName().matches(consumerParameters.getEventNameFilter())) {
+            
+            if (LOGGER.isTraceEnabled()) {
+                LOGGER.trace("onMessage(): event {} not processed, filtered  out by filter", apexEvent,
+                                consumerParameters.getEventNameFilter());
+            }
+            
+            return true;
+        }
+        else {
+            return false;
+        }
+    }
+
+    /**
      * Run a thread that runs forever (well until system termination anyway) and listens for incoming events on the
      * queue.
      */