Merge pull request #14247 from stuartwdouglas/14233

Fix warning in native mode when using bootstrap config
quarkusio · Jan 12, 2021 · ef960a9 · ef960a9
2 parents 96d411e + 8771509
commit ef960a9
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/...ment/src/main/java/io/quarkus/deployment/configuration/RunTimeConfigurationGenerator.java b/...ment/src/main/java/io/quarkus/deployment/configuration/RunTimeConfigurationGenerator.java
@@ -453,14 +453,17 @@ public void run() {
             final ConfigPatternMap<Container> runTimeIgnored = ConfigPatternMap
                     .merge(ConfigPatternMap.merge(buildTimePatternMap,
                             buildTimeRunTimePatternMap, combinator), bootstrapPatternMap, combinator);
+            final ConfigPatternMap<Container> bootstrapIgnored = ConfigPatternMap
+                    .merge(ConfigPatternMap.merge(buildTimePatternMap,
+                            buildTimeRunTimePatternMap, combinator), runTimePatternMap, combinator);
 
             final MethodDescriptor siParserBody = generateParserBody(buildTimeRunTimePatternMap, buildTimeRunTimeIgnored,
                     new StringBuilder("siParseKey"), false, Type.BUILD_TIME);
             final MethodDescriptor rtParserBody = generateParserBody(runTimePatternMap, runTimeIgnored,
                     new StringBuilder("rtParseKey"), false, Type.RUNTIME);
             MethodDescriptor bsParserBody = null;
             if (bootstrapConfigSetupNeeded()) {
-                bsParserBody = generateParserBody(bootstrapPatternMap, null,
+                bsParserBody = generateParserBody(bootstrapPatternMap, bootstrapIgnored,
                         new StringBuilder("bsParseKey"), false, Type.BOOTSTRAP);
             }