From 4009c9c8cacb92b9422a9dafcda1ff99750ecd4a Mon Sep 17 00:00:00 2001
From: hengsin <hengsin@gmail.com>
Date: Mon, 1 Feb 2021 22:25:34 +0800
Subject: [PATCH] IDEMPIERE-4679 SvrProcess: ensure unlock and flushBufferLog
 happens after transaction commit and close (#560)

---
 .../src/org/compiere/process/SvrProcess.java  | 60 +++++++++++++++----
 1 file changed, 50 insertions(+), 10 deletions(-)

diff --git a/org.adempiere.base/src/org/compiere/process/SvrProcess.java b/org.adempiere.base/src/org/compiere/process/SvrProcess.java
index 5278092233..44201b8132 100644
--- a/org.adempiere.base/src/org/compiere/process/SvrProcess.java
+++ b/org.adempiere.base/src/org/compiere/process/SvrProcess.java
@@ -39,6 +39,7 @@ import org.compiere.util.DB;
 import org.compiere.util.Env;
 import org.compiere.util.Msg;
 import org.compiere.util.Trx;
+import org.compiere.util.TrxEventListener;
 import org.osgi.service.event.Event;
 
 /**
@@ -176,16 +177,40 @@ public abstract class SvrProcess implements ProcessCall
 					m_trx.close();
 					m_trx = null;
 					m_pi.setTransactionName(null);
+					
+					unlock();
+					
+					// outside transaction processing [ teo_sarca, 1646891 ]
+					postProcess(!m_pi.isError());
+
+					@SuppressWarnings("unused")
+					Event eventPP = sendProcessEvent(IEventTopics.POST_PROCESS);
+
+				}
+				else
+				{
+					m_trx.addTrxEventListener(new TrxEventListener() {
+					
+						@Override
+						public void afterRollback(Trx trx, boolean success) {							
+						}
+						
+						@Override
+						public void afterCommit(Trx trx, boolean success) {
+						}
+						
+						@Override
+						public void afterClose(Trx trx) {
+							unlock();
+							
+							// outside transaction processing [ teo_sarca, 1646891 ]
+							postProcess(!m_pi.isError());
+							@SuppressWarnings("unused")
+							Event eventPP = sendProcessEvent(IEventTopics.POST_PROCESS);
+						}
+					});
 				}
-			
-				unlock();
 				
-				// outside transaction processing [ teo_sarca, 1646891 ]
-				postProcess(!m_pi.isError());
-
-				@SuppressWarnings("unused")
-				Event eventPP = sendProcessEvent(IEventTopics.POST_PROCESS);
-
 				Thread.currentThread().setContextClassLoader(contextLoader);
 			}
 		} finally {
@@ -245,8 +270,23 @@ public abstract class SvrProcess implements ProcessCall
 		if(msg != null && msg.startsWith("@Error@"))
 			success = false;
 
-		if (success)
-			flushBufferLog();
+		if (success) {
+			m_trx.addTrxEventListener(new TrxEventListener() {				
+				@Override
+				public void afterRollback(Trx trx, boolean success) {
+				}
+				
+				@Override
+				public void afterCommit(Trx trx, boolean success) {
+					if (success)
+						flushBufferLog();
+				}
+				
+				@Override
+				public void afterClose(Trx trx) {
+				}
+			});
+		}
 
 		//	Parse Variables
 		msg = Msg.parseTranslation(m_ctx, msg);