1 files changed, 9 insertions, 4 deletions

diff --git a/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/impl/async/BatchRecordFilterStrategy.java b/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/impl/async/BatchRecordFilterStrategy.java
index 088e96564c..2c7659949c 100644
--- a/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/impl/async/BatchRecordFilterStrategy.java
+++ b/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/impl/async/BatchRecordFilterStrategy.java
@@ -21,6 +21,7 @@
 package org.onap.cps.ncmp.api.impl.async;
 
 import org.apache.commons.lang3.SerializationUtils;
+import org.apache.kafka.common.header.Header;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.kafka.listener.adapter.RecordFilterStrategy;
@@ -41,10 +42,14 @@ public class BatchRecordFilterStrategy {
     @Bean
     public RecordFilterStrategy<Object, Object> filterBatchDataResponseEvent() {
         return consumedRecord -> {
-            final String headerValue = SerializationUtils
-                    .deserialize(consumedRecord.headers().lastHeader("eventType").value());
-            return !(headerValue != null
-                    && headerValue.startsWith("org.onap.cps.ncmp.events.async.BatchDataResponseEvent"));
+            final Header eventTypeHeader = consumedRecord.headers().lastHeader("eventType");
+            if (eventTypeHeader != null) {
+                final String eventTypeHeaderValue = SerializationUtils.deserialize(eventTypeHeader.value());
+                return !(eventTypeHeaderValue != null
+                        && eventTypeHeaderValue.startsWith("org.onap.cps.ncmp.events.async.BatchDataResponseEvent"));
+            } else {
+                return true;
+            }
         };
     }
 }