#2133 - Spring transactions not getting ChangeLog changeSet as part of postCommit() processing

ebean-core/src/main/java/io/ebeaninternal/api/SpiTransaction.java

@@ -318,4 +318,15 @@ public interface SpiTransaction extends Transaction {
    * Return true if explicitly set to skip cache (ignores skipOnWrite).
    */
   boolean isSkipCacheExplicit();
+
+  /**
+   * Fire post commit events and listeners.
+   */
+  void postCommit();
+
+  /**
+   * Fire post rollback events and listeners.
+   */
+  void postRollback(Throwable cause);
+
 }

ebean-core/src/main/java/io/ebeaninternal/api/SpiTransactionProxy.java

@@ -418,4 +418,13 @@ public abstract class SpiTransactionProxy implements SpiTransaction {
     transaction.flushBatchOnCollection();
   }
 
+  @Override
+  public void postCommit() {
+    transaction.postCommit();
+  }
+
+  @Override
+  public void postRollback(Throwable cause) {
+    transaction.postRollback(cause);
+  }
 }

ebean-core/src/main/java/io/ebeaninternal/server/transaction/ImplicitReadOnlyTransaction.java

@@ -586,6 +586,16 @@ class ImplicitReadOnlyTransaction implements SpiTransaction, TxnProfileEventCode
     }
   }
 
+  @Override
+  public void postCommit() {
+    // do nothing
+  }
+
+  @Override
+  public void postRollback(Throwable cause) {
+    // do nothing
+  }
+
   /**
    * Return true if the transaction is active.
    */

ebean-core/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java

@@ -985,6 +985,11 @@ class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
     firePreCommit();
     // only performCommit can throw an exception
     performCommit();
+    postCommit();
+  }
+
+  @Override
+  public void postCommit() {
     firePostCommit();
     notifyCommit();
   }
@@ -1132,11 +1137,16 @@ class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
 
     } finally {
       // these will not throw an exception
-      firePostRollback();
-      notifyRollback(cause);
+      postRollback(cause);
     }
   }
 
+  @Override
+  public void postRollback(Throwable cause) {
+    firePostRollback();
+    notifyRollback(cause);
+  }
+
   /**
    * If the transaction is active then perform rollback.
    */

ebean-core/src/main/java/io/ebeaninternal/server/transaction/JtaTransaction.java

@@ -13,9 +13,9 @@ public class JtaTransaction extends JdbcTransaction {
 
   private final UserTransaction userTransaction;
 
-  private boolean commmitted;
+  private final boolean newTransaction;
 
-  private boolean newTransaction;
+  private boolean committed;
 
   /**
    * Create the JtaTransaction.
@@ -41,7 +41,6 @@ public class JtaTransaction extends JdbcTransaction {
       if (connection.getAutoCommit()) {
         connection.setAutoCommit(false);
       }
-
     } catch (SQLException e) {
       throw new PersistenceException(e);
     }
@@ -52,7 +51,7 @@ public class JtaTransaction extends JdbcTransaction {
    */
   @Override
   public void commit() {
-    if (commmitted) {
+    if (committed) {
       throw new PersistenceException("This transaction has already been committed.");
     }
     try {
@@ -60,14 +59,14 @@ public class JtaTransaction extends JdbcTransaction {
         if (newTransaction) {
           userTransaction.commit();
         }
-        notifyCommit();
+        postCommit();
       } finally {
         close();
       }
     } catch (Exception e) {
       throw new PersistenceException(e);
     }
-    commmitted = true;
+    committed = true;
   }
 
   @Override
@@ -80,7 +79,7 @@ public class JtaTransaction extends JdbcTransaction {
    */
   @Override
   public void rollback(Throwable e) {
-    if (!commmitted) {
+    if (!committed) {
       try {
         try {
           if (userTransaction != null) {
@@ -90,7 +89,7 @@ public class JtaTransaction extends JdbcTransaction {
               userTransaction.setRollbackOnly();
             }
           }
-          notifyRollback(e);
+          postRollback(e);
         } finally {
           closeConnection();
         }
@@ -98,7 +97,6 @@ public class JtaTransaction extends JdbcTransaction {
         throw new PersistenceException(ex);
       }
     }
-
   }
 
   /**

ebean-core/src/main/java/io/ebeaninternal/server/transaction/JtaTransactionManager.java

@@ -190,19 +190,17 @@ public class JtaTransactionManager implements ExternalTransactionManager {
 
     @Override
     public void beforeCompletion() {
-      // Future note: for JPA2 locking we will
-      // have beforeCommit events to fire
+      transaction.flush();
     }
 
     @Override
     public void afterCompletion(int status) {
-
       switch (status) {
         case Status.STATUS_COMMITTED:
           if (logger.isDebugEnabled()) {
             logger.debug("Jta Txn [" + transaction.getId() + "] committed");
           }
-          transactionManager.notifyOfCommit(transaction);
+          transaction.postCommit();
           // Remove this transaction object as it is completed
           transactionManager.scope().clearExternal();
           break;
@@ -211,7 +209,7 @@ public class JtaTransactionManager implements ExternalTransactionManager {
           if (logger.isDebugEnabled()) {
             logger.debug("Jta Txn [" + transaction.getId() + "] rollback");
           }
-          transactionManager.notifyOfRollback(transaction, null);
+          transaction.postRollback(null);
           // Remove this transaction object as it is completed
           transactionManager.scope().clearExternal();
           break;

ebean-core/src/main/java/io/ebeaninternal/server/transaction/NoTransaction.java

@@ -88,6 +88,16 @@ class NoTransaction implements SpiTransaction {
     // do nothing
   }
 
+  @Override
+  public void postCommit() {
+    // do nothing
+  }
+
+  @Override
+  public void postRollback(Throwable cause) {
+    // do nothing
+  }
+
   @Override
   public String getLogPrefix() {
     return null;