added null checks to key and dummy string serializers

peteralfonsi · Dec 7, 2023 · 90c0f9a · 90c0f9a
1 parent b7fcac7
commit 90c0f9a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git 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
@@ -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);
         }