Merge pull request #33140 from stuartwdouglas/static-fix

Fix Hibernate Reactive dev mode
quarkusio · May 7, 2023 · 0951b3d · 0951b3d
2 parents 1d99246 + fcd2808
commit 0951b3d
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 0 deletions.
diff --git a/...arkus/hibernate/reactive/panache/common/deployment/PanacheJpaCommonResourceProcessor.java b/...arkus/hibernate/reactive/panache/common/deployment/PanacheJpaCommonResourceProcessor.java
@@ -41,6 +41,7 @@
 import io.quarkus.deployment.annotations.ExecutionTime;
 import io.quarkus.deployment.annotations.Record;
 import io.quarkus.deployment.builditem.CombinedIndexBuildItem;
+import io.quarkus.deployment.builditem.ShutdownContextBuildItem;
 import io.quarkus.deployment.util.JandexUtil;
 import io.quarkus.gizmo.ClassCreator;
 import io.quarkus.hibernate.orm.deployment.HibernateOrmEnabled;
@@ -208,6 +209,12 @@ void buildNamedQueryMap(List<PanacheNamedQueryEntityClassBuildStep> namedQueryEn
         panacheHibernateRecorder.setNamedQueryMap(namedQueryMap);
     }
 
+    @BuildStep
+    @Record(ExecutionTime.RUNTIME_INIT)
+    public void shutdown(ShutdownContextBuildItem shutdownContextBuildItem, PanacheHibernateRecorder panacheHibernateRecorder) {
+        panacheHibernateRecorder.clear(shutdownContextBuildItem);
+    }
+
     private void lookupNamedQueries(CombinedIndexBuildItem index, DotName name, Set<String> namedQueries) {
         ClassInfo classInfo = index.getComputingIndex().getClassByName(name);
         if (classInfo == null) {

diff --git a/...n/java/io/quarkus/hibernate/reactive/panache/common/runtime/PanacheHibernateRecorder.java b/...n/java/io/quarkus/hibernate/reactive/panache/common/runtime/PanacheHibernateRecorder.java
@@ -3,11 +3,21 @@
 import java.util.Map;
 import java.util.Set;
 
+import io.quarkus.runtime.ShutdownContext;
 import io.quarkus.runtime.annotations.Recorder;
 
 @Recorder
 public class PanacheHibernateRecorder {
     public void setNamedQueryMap(Map<String, Set<String>> namedQueryMap) {
         NamedQueryUtil.setNamedQueryMap(namedQueryMap);
     }
+
+    public void clear(ShutdownContext shutdownContext) {
+        shutdownContext.addShutdownTask(new Runnable() {
+            @Override
+            public void run() {
+                SessionOperations.clear();
+            }
+        });
+    }
 }
diff --git a/...src/main/java/io/quarkus/hibernate/reactive/panache/common/runtime/SessionOperations.java b/...src/main/java/io/quarkus/hibernate/reactive/panache/common/runtime/SessionOperations.java
@@ -205,4 +205,8 @@ static Mutiny.SessionFactory getSessionFactory() {
         return SESSION_FACTORY.get();
     }
 
+    static void clear() {
+        SESSION_FACTORY.clear();
+        SESSION_KEY.clear();
+    }
 }