Panache EntityBase should flush on the right entity managerf

Fixes #24394
quarkusio · Mar 22, 2022 · 336550b · 336550b
1 parent 5742fb0
commit 336550b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/.../runtime/src/main/kotlin/io/quarkus/hibernate/orm/panache/kotlin/PanacheRepositoryBase.kt b/.../runtime/src/main/kotlin/io/quarkus/hibernate/orm/panache/kotlin/PanacheRepositoryBase.kt
@@ -1,11 +1,11 @@
 package io.quarkus.hibernate.orm.panache.kotlin
 
-import io.quarkus.hibernate.orm.panache.common.runtime.AbstractJpaOperations
 import io.quarkus.hibernate.orm.panache.common.runtime.AbstractJpaOperations.implementationInjectionMissing
 import io.quarkus.hibernate.orm.panache.kotlin.runtime.KotlinJpaOperations.Companion.INSTANCE
 import io.quarkus.panache.common.Parameters
 import io.quarkus.panache.common.Sort
 import io.quarkus.panache.common.impl.GenerateBridge
+import java.lang.reflect.ParameterizedType
 import java.util.stream.Stream
 import javax.persistence.EntityManager
 import javax.persistence.LockModeType
@@ -89,7 +89,8 @@ interface PanacheRepositoryBase<Entity : Any, Id: Any> {
      * Flushes all pending changes to the database using the default EntityManager.
      */
     fun flush() {
-        getEntityManager().flush()
+        val entityClass = (javaClass.genericSuperclass as ParameterizedType).actualTypeArguments[0] as Class<*>
+        INSTANCE.getEntityManager(entityClass).flush()
     }
 
     /**

diff --git a/...panache/runtime/src/main/java/io/quarkus/hibernate/orm/panache/PanacheRepositoryBase.java b/...panache/runtime/src/main/java/io/quarkus/hibernate/orm/panache/PanacheRepositoryBase.java
@@ -3,6 +3,7 @@
 import static io.quarkus.hibernate.orm.panache.common.runtime.AbstractJpaOperations.implementationInjectionMissing;
 import static io.quarkus.hibernate.orm.panache.runtime.JpaOperations.INSTANCE;
 
+import java.lang.reflect.ParameterizedType;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -112,7 +113,8 @@ default boolean isPersistent(Entity entity) {
      * FFlushes all pending changes to the database using the default EntityManager.
      */
     default void flush() {
-        INSTANCE.getEntityManager().flush();
+        Class entityClass = ((Class) ((ParameterizedType) getClass().getGenericSuperclass()).getActualTypeArguments()[0]);
+        INSTANCE.getEntityManager(entityClass).flush();
     }
 
     // Queries