From 0d3f3130bc7fd2cae3057a7b0ef93a110a3d00c9 Mon Sep 17 00:00:00 2001
From: Tim Quinn <tim.quinn@oracle.com>
Date: Mon, 11 Dec 2023 12:33:43 -0600
Subject: [PATCH] Fix premature access to RegistryFactory (#8118)

---
 .../java/io/helidon/integrations/cdi/jpa/JpaExtension.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/integrations/cdi/jpa-cdi/src/main/java/io/helidon/integrations/cdi/jpa/JpaExtension.java b/integrations/cdi/jpa-cdi/src/main/java/io/helidon/integrations/cdi/jpa/JpaExtension.java
index 534a3c1d12c..fc40617dce3 100644
--- a/integrations/cdi/jpa-cdi/src/main/java/io/helidon/integrations/cdi/jpa/JpaExtension.java
+++ b/integrations/cdi/jpa-cdi/src/main/java/io/helidon/integrations/cdi/jpa/JpaExtension.java
@@ -804,7 +804,7 @@ private <T extends EntityManager> void saveEntityManagerQualifiers(@Observes
      * @exception IOException if an input or output error occurs, typically because a {@code META-INF/persistence.xml}
      * resource was found but could not be loaded for some reason
      *
-     * @exception JAXBException if there was a problem {@linkplain Unmarshaller#unmarshal(Reader) unmarshalling} a
+     * @exception JAXBException if there was a problem {@linkplain Unmarshaller#unmarshal(java.io.Reader) unmarshalling} a
      * {@code META-INF/persistence.xml} resource
      *
      * @exception NullPointerException if either {@code event} or {@code beanManager} is {@code null}
@@ -2045,7 +2045,7 @@ private void maybeAddPersistenceProviderBean(AfterBeanDiscovery event,
 
     private void onStartup(@Observes
                            @Initialized(ApplicationScoped.class)
-                           @Priority(LIBRARY_BEFORE)
+                           @Priority(LIBRARY_BEFORE + 20) // Must be later than metrics CDI extension priority
                            Object event,
                            @ContainerManaged
                            Instance<EntityManagerFactory> emfs) {