Fire EntityChange events immediately

JetBrains · Jan 11, 2020 · d211400 · d211400
1 parent 179142f
commit d211400
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 11 deletions.
diff --git a/exposed-dao/src/main/kotlin/org/jetbrains/exposed/dao/EntityHook.kt b/exposed-dao/src/main/kotlin/org/jetbrains/exposed/dao/EntityHook.kt
@@ -38,20 +38,14 @@ object EntityHook {
 }
 
 fun Transaction.registerChange(entityClass: EntityClass<*, Entity<*>>, entityId: EntityID<*>, changeType: EntityChangeType) {
-    EntityChange(entityClass, entityId, changeType, id).let {
-        if (entityEvents.lastOrNull() != it) {
-            entityEvents.add(it)
-        }
-    }
-}
+    val event = EntityChange(entityClass, entityId, changeType, id)
 
-fun Transaction.alertSubscribers() {
-    entityEvents.forEach { e ->
+    if (entityEvents.lastOrNull() != event) {
+        entityEvents.add(event)
         entitySubscribers.forEach {
-            it(e)
+            it(event)
         }
     }
-    entityEvents.clear()
 }
 
 fun Transaction.registeredChanges() = entityEvents.toList()

diff --git a/exposed-dao/src/main/kotlin/org/jetbrains/exposed/dao/EntityLifecycleInterceptor.kt b/exposed-dao/src/main/kotlin/org/jetbrains/exposed/dao/EntityLifecycleInterceptor.kt
@@ -38,7 +38,6 @@ class EntityLifecycleInterceptor : GlobalStatementInterceptor {
 
     override fun beforeCommit(transaction: Transaction) {
         val created = transaction.flushCache()
-        transaction.alertSubscribers()
         val createdByHooks = transaction.flushCache()
         EntityCache.invalidateGlobalCaches(created + createdByHooks)
     }