Avoid NPE when RESTEasy Reactive is used together with the classic RE…

…ST client Fixes: quarkusio#24120
gsmet · Mar 8, 2022 · d3fd924 · d3fd924
1 parent b98c54c
commit d3fd924
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/...e/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/headers/HeaderUtil.java b/...e/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/headers/HeaderUtil.java
@@ -28,9 +28,10 @@
 /**
  * These work for MultivaluedMap with String and Object
  */
+@SuppressWarnings({ "rawtypes", "unchecked" })
 public class HeaderUtil {
 
-    private static final ClassValue<RuntimeDelegate.HeaderDelegate> HEADER_DELEGATE_CACHE = new ClassValue() {
+    private static final ClassValue<RuntimeDelegate.HeaderDelegate<?>> HEADER_DELEGATE_CACHE = new ClassValue<>() {
         @Override
         protected RuntimeDelegate.HeaderDelegate<?> computeValue(Class type) {
             return RuntimeDelegate.getInstance().createHeaderDelegate(type);
@@ -41,7 +42,11 @@ public static String headerToString(Object obj) {
         if (obj instanceof String) {
             return (String) obj;
         } else {
-            return HEADER_DELEGATE_CACHE.get(obj.getClass()).toString(obj);
+            RuntimeDelegate.HeaderDelegate delegate = HEADER_DELEGATE_CACHE.get(obj.getClass());
+            if (delegate != null) {
+                return delegate.toString(obj);
+            }
+            return obj.toString();
         }
     }