X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=holmes-actions%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fholmes%2Fcommon%2Futils%2Ftransactionid%2FTransactionIdFilter.java;h=9d42b911aaad40c6111e29f332fb63e6861a02b6;hb=732234a32c7413ccf4f49b592ff6ed3e17c7059b;hp=f72466d1f951128b48a3de641b33e1b2157278ce;hpb=6f99775bd30cea7a2471ba37b875067a40bd5aeb;p=holmes%2Fcommon.git

diff --git a/holmes-actions/src/main/java/org/onap/holmes/common/utils/transactionid/TransactionIdFilter.java b/holmes-actions/src/main/java/org/onap/holmes/common/utils/transactionid/TransactionIdFilter.java
index f72466d..9d42b91 100644
--- a/holmes-actions/src/main/java/org/onap/holmes/common/utils/transactionid/TransactionIdFilter.java
+++ b/holmes-actions/src/main/java/org/onap/holmes/common/utils/transactionid/TransactionIdFilter.java
@@ -59,8 +59,9 @@ public class TransactionIdFilter implements Filter {
 
         String requestID = ensureTransactionIdIsPresent(requestWithTransactionId);
         HttpServletResponse httpServletResponse = (HttpServletResponse) servletResponse;
-        if (TransactionIdUtils.validate(requestID)) {
-            httpServletResponse.setHeader(TransactionIdUtils.REQUEST_ID_HEADER, requestID);
+        String validatedRequestID = TransactionIdUtils.validate(requestID);
+        if (validatedRequestID != null) {
+            httpServletResponse.setHeader(TransactionIdUtils.REQUEST_ID_HEADER, validatedRequestID);
         } else {
             log.warn("A mal-formatted request ID has been detected: {}. It will be replaced by the default ID: {}",
                     requestID, DEFAULT_REQUEST_ID);