Correct check of ConfigValue having a value with indexed APIs

smallrye · Feb 18, 2025 · 8e45ea6 · 8e45ea6
1 parent e15af82
commit 8e45ea6
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/implementation/src/main/java/io/smallrye/config/SmallRyeConfig.java b/implementation/src/main/java/io/smallrye/config/SmallRyeConfig.java
@@ -204,7 +204,7 @@ public <T, C extends Collection<T>> C getValues(String name, Converter<T> conver
 
         // Use indexed if comma separated empty or higher in ordinality
         ConfigValue commaSeparated = getConfigValue(name);
-        if (commaSeparated == null || indexedOrdinality >= commaSeparated.getConfigSourceOrdinal()) {
+        if (commaSeparated.getValue() == null || indexedOrdinality >= commaSeparated.getConfigSourceOrdinal()) {
             return collection;
         } else {
             return getValue(name, newCollectionConverter(converter, collectionFactory));
@@ -397,7 +397,7 @@ public <T> T getValue(String name, Class<T> propertyType) {
 
             // Use indexed if comma separated empty or higher in ordinality
             ConfigValue commaSeparated = getConfigValue(name);
-            if (commaSeparated == null || indexedOrdinality >= commaSeparated.getConfigSourceOrdinal()) {
+            if (commaSeparated.getValue() == null || indexedOrdinality >= commaSeparated.getConfigSourceOrdinal()) {
                 return (T) array;
             } else {
                 return convertValue(commaSeparated, requireConverter(propertyType));
@@ -531,7 +531,7 @@ public <T> Optional<T> getOptionalValue(String name, Class<T> propertyType) {
 
             // Use indexed if comma separated empty or higher in ordinality
             ConfigValue commaSeparated = getConfigValue(name);
-            if (commaSeparated == null || indexedOrdinality >= commaSeparated.getConfigSourceOrdinal()) {
+            if (commaSeparated.getValue() == null || indexedOrdinality >= commaSeparated.getConfigSourceOrdinal()) {
                 return (Optional<T>) Optional.of(array);
             } else {
                 return getValue(name, getOptionalConverter(propertyType));
@@ -574,7 +574,7 @@ public <T, C extends Collection<T>> Optional<C> getOptionalValues(String name, C
 
         // Use indexed if comma separated empty or higher in ordinality
         ConfigValue commaSeparated = getConfigValue(name);
-        if (commaSeparated == null || indexedOrdinality >= commaSeparated.getConfigSourceOrdinal()) {
+        if (commaSeparated.getValue() == null || indexedOrdinality >= commaSeparated.getConfigSourceOrdinal()) {
             return collection.isEmpty() ? Optional.empty() : Optional.of(collection);
         } else {
             return getOptionalValue(name, newCollectionConverter(converter, collectionFactory));