From b28ed559629486a1510cbc9153a763e5b254540d Mon Sep 17 00:00:00 2001
From: George Chen <qchea@amazon.com>
Date: Fri, 25 Apr 2025 17:29:28 -0500
Subject: [PATCH] FIX: NPE in JsonCodec with keyName

Signed-off-by: George Chen <qchea@amazon.com>
---
 .../dataprepper/model/codec/JsonDecoder.java       |  2 +-
 .../dataprepper/model/codec/JsonDecoderTest.java   | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/data-prepper-api/src/main/java/org/opensearch/dataprepper/model/codec/JsonDecoder.java b/data-prepper-api/src/main/java/org/opensearch/dataprepper/model/codec/JsonDecoder.java
index 05bc73bdc8..852d855adf 100644
--- a/data-prepper-api/src/main/java/org/opensearch/dataprepper/model/codec/JsonDecoder.java
+++ b/data-prepper-api/src/main/java/org/opensearch/dataprepper/model/codec/JsonDecoder.java
@@ -72,7 +72,7 @@ public void parse(InputStream inputStream, Instant timeReceived, Consumer<Record
             }
 
             if (jsonParser.getCurrentToken() == JsonToken.START_ARRAY) {
-                if (keyName != null && !nodeName.equals(keyName)) {
+                if (keyName != null && !keyName.equals(nodeName)) {
                     continue;
                 }
                 parseRecordsArray(jsonParser, timeReceived, eventConsumer, includeKeysMap, includeMetadataKeysMap);
diff --git a/data-prepper-api/src/test/java/org/opensearch/dataprepper/model/codec/JsonDecoderTest.java b/data-prepper-api/src/test/java/org/opensearch/dataprepper/model/codec/JsonDecoderTest.java
index c49e6972a7..e3403cd140 100644
--- a/data-prepper-api/src/test/java/org/opensearch/dataprepper/model/codec/JsonDecoderTest.java
+++ b/data-prepper-api/src/test/java/org/opensearch/dataprepper/model/codec/JsonDecoderTest.java
@@ -171,6 +171,20 @@ void test_basicJsonDecoder_withInputConfig() throws IOException {
             assertThat(receivedTime, equalTo(now));
         }
 
+        @Test
+        void test_JsonDecoder_withKeyName_when_parsing_json_array_should_skip() throws IOException {
+            final Instant now = Instant.now();
+            String inputString = "[]";
+            List<Record<Event>> records = new ArrayList<>();
+            jsonDecoder = new JsonDecoder(key_name, null, null, maxEventLength);
+            jsonDecoder.parse(new ByteArrayInputStream(inputString.getBytes()), now, (record) -> {
+                records.add(record);
+                receivedTime = record.getData().getEventHandle().getInternalOriginationTime();
+            });
+
+            assertTrue(records.isEmpty());
+        }
+
         @Test
         void test_basicJsonDecoder_withInputConfig_withoutEvents_empty_metadata_keys() throws IOException {
             final Instant now = Instant.now();