Merge pull request #27 from ia3andy/fix-npe

Fix NPE
quarkiverse · Jun 27, 2024 · 3211544 · 3211544
2 parents 42d586b + e54f7d9
commit 3211544
Show file tree

Hide file tree

Showing 3 changed files with 12 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
@@ -38,7 +38,7 @@ void produceBeans(BuildProducer<AdditionalBeanBuildItem> additionalBeanProducer)
     }
 
     @BuildStep
-    @Record(ExecutionTime.RUNTIME_INIT)
+    @Record(ExecutionTime.STATIC_INIT)
     void initHandler(List<NotFoundPageDisplayableEndpointBuildItem> notFoundPageDisplayableEndpoints,
             StaticResourcesBuildItem staticResourcesBuildItem,
             OutputTargetBuildItem outputTarget,

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);
     }