From 90c0f9a850e9e9632c49deeb04ed1a080b2d0383 Mon Sep 17 00:00:00 2001
From: Peter Alfonsi <petealft@amazon.com>
Date: Thu, 7 Dec 2023 12:56:50 -0800
Subject: [PATCH] added null checks to key and dummy string serializers

---
 .../java/org/opensearch/indices/IRCKeyWriteableSerializer.java | 3 +++
 .../common/cache/tier/EhCacheDiskCachingTierTests.java         | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/server/src/main/java/org/opensearch/indices/IRCKeyWriteableSerializer.java b/server/src/main/java/org/opensearch/indices/IRCKeyWriteableSerializer.java
index 92e874518df54..55d770804431f 100644
--- a/server/src/main/java/org/opensearch/indices/IRCKeyWriteableSerializer.java
+++ b/server/src/main/java/org/opensearch/indices/IRCKeyWriteableSerializer.java
@@ -41,6 +41,9 @@ public byte[] serialize(IndicesRequestCache.Key object) {
 
     @Override
     public IndicesRequestCache.Key deserialize(byte[] bytes) {
+        if (bytes == null) {
+            return null;
+        }
         try {
             BytesStreamInput is = new BytesStreamInput(bytes, 0, bytes.length);
             return irc.new Key(is);
diff --git a/server/src/test/java/org/opensearch/common/cache/tier/EhCacheDiskCachingTierTests.java b/server/src/test/java/org/opensearch/common/cache/tier/EhCacheDiskCachingTierTests.java
index 139e82b274d34..eb0ecad79a045 100644
--- a/server/src/test/java/org/opensearch/common/cache/tier/EhCacheDiskCachingTierTests.java
+++ b/server/src/test/java/org/opensearch/common/cache/tier/EhCacheDiskCachingTierTests.java
@@ -325,6 +325,9 @@ public byte[] serialize(String object) {
 
         @Override
         public String deserialize(byte[] bytes) {
+            if (bytes == null) {
+                return null;
+            }
             return new String(bytes, charset);
         }