Fix NPE

quarkiverse · Jun 27, 2024 · c8d6be8 · c8d6be8
1 parent 08a59e7
commit c8d6be8
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 7 deletions.
diff --git a/.gitignore b/.gitignore
@@ -62,3 +62,5 @@ pom.xml.tag
 pom.xml.releaseBackup
 pom.xml.versionsBackup
 release.properties
+
+.quarkus
diff --git a/...ployment/src/main/java/io/quarkiverse/roq/generator/deployment/RoqGeneratorProcessor.java b/...ployment/src/main/java/io/quarkiverse/roq/generator/deployment/RoqGeneratorProcessor.java
@@ -6,6 +6,7 @@
 import java.util.List;
 import java.util.Set;
 
+import io.quarkus.deployment.builditem.nativeimage.RuntimeInitializedClassBuildItem;
 import org.jboss.logging.Logger;
 
 import io.quarkiverse.roq.generator.runtime.FixedStaticPagesProvider;
@@ -32,9 +33,10 @@ FeatureBuildItem feature() {
     }
 
     @BuildStep
-    void produceBeans(BuildProducer<AdditionalBeanBuildItem> additionalBeanProducer) {
+    void produceBeans(BuildProducer<AdditionalBeanBuildItem> additionalBeanProducer, BuildProducer<RuntimeInitializedClassBuildItem> runtimeInitializedClassProducer) {
         additionalBeanProducer.produce(AdditionalBeanBuildItem.unremovableOf(RoqGenerator.class));
         additionalBeanProducer.produce(AdditionalBeanBuildItem.unremovableOf(FixedStaticPagesProvider.class));
+        runtimeInitializedClassProducer.produce(new RuntimeInitializedClassBuildItem(FixedStaticPagesProvider.class.getName()));
     }
 
     @BuildStep

diff --git a/.../runtime/src/main/java/io/quarkiverse/roq/generator/runtime/FixedStaticPagesProvider.java b/.../runtime/src/main/java/io/quarkiverse/roq/generator/runtime/FixedStaticPagesProvider.java
@@ -13,7 +13,7 @@
 
 @Singleton
 public class FixedStaticPagesProvider {
-    private static String targetDir;
+    private static volatile String targetDir;
     @Inject
     RoqGeneratorConfig config;
 
@@ -42,13 +42,16 @@ StaticPages produce() {
                 StaticPages.add(StaticPage.builder().path(p).fixed().build());
                 continue;
             }
-            // Try to detect fixed paths from glob pattern
-            for (String staticPath : staticPaths) {
-                PathMatcher matcher = FileSystems.getDefault().getPathMatcher("glob:" + p);
-                if (matcher.matches(Path.of(staticPath))) {
-                    StaticPages.add(StaticPage.builder().fixed().path(staticPath).build());
+            if (staticPaths != null) {
+                // Try to detect fixed paths from glob pattern
+                for (String staticPath : staticPaths) {
+                    PathMatcher matcher = FileSystems.getDefault().getPathMatcher("glob:" + p);
+                    if (matcher.matches(Path.of(staticPath))) {
+                        StaticPages.add(StaticPage.builder().fixed().path(staticPath).build());
+                    }
                 }
             }
+
         }
         return new StaticPages(StaticPages);
     }