From a37d1f4aeb8a91a3361ed17cf636153587e2f7ed Mon Sep 17 00:00:00 2001
From: Nimrod Gilboa Markevich <59927337+nimrod-up9@users.noreply.github.com>
Date: Thu, 19 Aug 2021 10:59:13 +0300
Subject: [PATCH] Fixed: Stopped redacting JSON after encountering nil values
 (#233)

---
 .../pkg/sensitiveDataFiltering/messageSensitiveDataCleaner.go | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/agent/pkg/sensitiveDataFiltering/messageSensitiveDataCleaner.go b/agent/pkg/sensitiveDataFiltering/messageSensitiveDataCleaner.go
index cc0e4d289..4a4889147 100644
--- a/agent/pkg/sensitiveDataFiltering/messageSensitiveDataCleaner.go
+++ b/agent/pkg/sensitiveDataFiltering/messageSensitiveDataCleaner.go
@@ -158,9 +158,11 @@ func filterJsonBody(bytes []byte) ([]byte, error) {
 
 func filterJsonMap(jsonMap map[string] interface{}) {
 	for key, value := range jsonMap {
+		// Do not replace nil values with maskedFieldPlaceholderValue
 		if value == nil {
-			return
+			continue
 		}
+
 		nestedMap, isNested := value.(map[string] interface{})
 		if isNested {
 			filterJsonMap(nestedMap)