From f5e527cdcf153ce89c9cf0eba0cf839cfa55b550 Mon Sep 17 00:00:00 2001
From: Cedrick Lunven <cedrick.lunven@gmail.com>
Date: Thu, 11 Apr 2024 10:02:08 +0200
Subject: [PATCH] update

---
 .../main/java/com/datastax/astra/internal/utils/JsonUtils.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/astra-db-java/src/main/java/com/datastax/astra/internal/utils/JsonUtils.java b/astra-db-java/src/main/java/com/datastax/astra/internal/utils/JsonUtils.java
index 002d0d82..f04ee3c7 100644
--- a/astra-db-java/src/main/java/com/datastax/astra/internal/utils/JsonUtils.java
+++ b/astra-db-java/src/main/java/com/datastax/astra/internal/utils/JsonUtils.java
@@ -156,6 +156,9 @@ public static String marshall(Object o) {
      */
     @SuppressWarnings("unchecked")
     public static <T> T convertValue(Object bean, Class<T> clazz) {
+        if (bean == null) {
+            return null;
+        }
         if (bean.getClass() == clazz) {
             return (T) bean;
         }