From da31eb7f8be17c4d3cda06e185081eb50eecee4c Mon Sep 17 00:00:00 2001
From: Nikita Koksharov <nkoksharov@redisson.pro>
Date: Fri, 9 Aug 2024 20:00:24 +0300
Subject: [PATCH] Improvement - quarkus should make an attempt to read config
 file using Thread's ContextClassLoader #6035

---
 .../redisson/client/runtime/RedissonClientProducer.java        | 3 +++
 .../redisson/client/runtime/RedissonClientProducer.java        | 3 +++
 .../redisson/client/runtime/RedissonClientProducer.java        | 3 +++
 3 files changed, 9 insertions(+)

diff --git a/redisson-quarkus/redisson-quarkus-16/runtime/src/main/java/io/quarkus/redisson/client/runtime/RedissonClientProducer.java b/redisson-quarkus/redisson-quarkus-16/runtime/src/main/java/io/quarkus/redisson/client/runtime/RedissonClientProducer.java
index f04ff5738..80d325b4e 100644
--- a/redisson-quarkus/redisson-quarkus-16/runtime/src/main/java/io/quarkus/redisson/client/runtime/RedissonClientProducer.java
+++ b/redisson-quarkus/redisson-quarkus-16/runtime/src/main/java/io/quarkus/redisson/client/runtime/RedissonClientProducer.java
@@ -61,6 +61,9 @@ public class RedissonClientProducer {
         Optional<String> configFile = ConfigProvider.getConfig().getOptionalValue("quarkus.redisson.file", String.class);
         if (configFile.isPresent()) {
             configStream = getClass().getResourceAsStream(configFile.get());
+            if (configStream == null) {
+                configStream = Thread.currentThread().getContextClassLoader().getResourceAsStream(configFile.get());
+            }
         } else {
             configStream = Thread.currentThread().getContextClassLoader().getResourceAsStream("redisson.yaml");
         }
diff --git a/redisson-quarkus/redisson-quarkus-20/runtime/src/main/java/io/quarkus/redisson/client/runtime/RedissonClientProducer.java b/redisson-quarkus/redisson-quarkus-20/runtime/src/main/java/io/quarkus/redisson/client/runtime/RedissonClientProducer.java
index 3b83e1efc..5cfe5111a 100644
--- a/redisson-quarkus/redisson-quarkus-20/runtime/src/main/java/io/quarkus/redisson/client/runtime/RedissonClientProducer.java
+++ b/redisson-quarkus/redisson-quarkus-20/runtime/src/main/java/io/quarkus/redisson/client/runtime/RedissonClientProducer.java
@@ -61,6 +61,9 @@ public class RedissonClientProducer {
         Optional<String> configFile = ConfigProvider.getConfig().getOptionalValue("quarkus.redisson.file", String.class);
         if (configFile.isPresent()) {
             configStream = getClass().getResourceAsStream(configFile.get());
+            if (configStream == null) {
+                configStream = Thread.currentThread().getContextClassLoader().getResourceAsStream(configFile.get());
+            }
         } else {
             configStream = Thread.currentThread().getContextClassLoader().getResourceAsStream("redisson.yaml");
         }
diff --git a/redisson-quarkus/redisson-quarkus-30/cdi/runtime/src/main/java/io/quarkus/redisson/client/runtime/RedissonClientProducer.java b/redisson-quarkus/redisson-quarkus-30/cdi/runtime/src/main/java/io/quarkus/redisson/client/runtime/RedissonClientProducer.java
index b4b38b8c4..f42b82e80 100644
--- a/redisson-quarkus/redisson-quarkus-30/cdi/runtime/src/main/java/io/quarkus/redisson/client/runtime/RedissonClientProducer.java
+++ b/redisson-quarkus/redisson-quarkus-30/cdi/runtime/src/main/java/io/quarkus/redisson/client/runtime/RedissonClientProducer.java
@@ -61,6 +61,9 @@ public class RedissonClientProducer {
         Optional<String> configFile = ConfigProvider.getConfig().getOptionalValue("quarkus.redisson.file", String.class);
         if (configFile.isPresent()) {
             configStream = getClass().getResourceAsStream(configFile.get());
+            if (configStream == null) {
+                configStream = Thread.currentThread().getContextClassLoader().getResourceAsStream(configFile.get());
+            }
         } else {
             configStream = Thread.currentThread().getContextClassLoader().getResourceAsStream("redisson.yaml");
         }