From fb4dfe08bd857ba050c0815f615c5a97cafb4f80 Mon Sep 17 00:00:00 2001
From: Carlos Ruiz <carg67@gmail.com>
Date: Sat, 1 Jun 2013 10:52:05 -0500
Subject: [PATCH] IDEMPIERE-1006 Improve transaction and busy dialog for merge
 window

---
 .../org/adempiere/webui/apps/form/WMerge.java |  9 ++----
 .../src/org/compiere/apps/form/Merge.java     | 31 ++++++-------------
 2 files changed, 13 insertions(+), 27 deletions(-)

diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WMerge.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WMerge.java
index 9f23b9eb62..e5aa7e3b8d 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WMerge.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WMerge.java
@@ -77,7 +77,6 @@ public class WMerge extends Merge implements IFormController, EventListener<Even
 	private ConfirmPanel confirmPanel = new ConfirmPanel(true);
 	private String m_msg;
 	private boolean m_success;
-	private BusyDialog progressWindow;
 
 	private MergeRunnable runnable;
 
@@ -255,10 +254,7 @@ public class WMerge extends Merge implements IFormController, EventListener<Even
 				{
 					updateDeleteTable(columnNameRef);
 
-					progressWindow = new BusyDialog();
-					progressWindow.setPage(form.getPage());
-					progressWindow.doHighlighted();
-					
+					Clients.showBusy("");
 					runnable = new MergeRunnable(columnNameRef, fromIdRef, toIdRef);
 					Clients.response(new AuEcho(form, "runProcess", null));
 				}
@@ -279,7 +275,8 @@ public class WMerge extends Merge implements IFormController, EventListener<Even
 		public void run() {
 			try {                    
 				m_success = merge (columnName, from_ID, to_ID);
-				postMerge(columnName, to_ID);
+				if (m_success)
+					postMerge(columnName, to_ID);
 			} finally{
 				Clients.clearBusy();
 				Clients.response(new AuEcho(form, "onAfterProcess", null));
diff --git a/org.adempiere.ui/src/org/compiere/apps/form/Merge.java b/org.adempiere.ui/src/org/compiere/apps/form/Merge.java
index 61deafde41..4977ac1bba 100644
--- a/org.adempiere.ui/src/org/compiere/apps/form/Merge.java
+++ b/org.adempiere.ui/src/org/compiere/apps/form/Merge.java
@@ -28,8 +28,6 @@ import org.compiere.util.Trx;
 
 public class Merge 
 {
-	@SuppressWarnings("unused")
-	private static final long serialVersionUID = 149783846292562740L;
 	/**	Window No			*/
 	public int         	m_WindowNo = 0;
 	/**	Total Count			*/
@@ -115,7 +113,6 @@ public class Merge
 		ResultSet rs = null;
 		try
 		{
-			
 			m_trx = Trx.get(Trx.createTrxName("merge"), true);
 			//
 			pstmt = DB.prepareStatement(sql, Trx.createTrxName());
@@ -142,9 +139,6 @@ public class Merge
 			{
 				sql = "DELETE " + TableName + " WHERE " + ColumnName + "=" + from_ID;
 				
-
-
-				
 				if ( DB.executeUpdate(sql, m_trx.getTrxName()) < 0 )
 				{
 					m_errorLog.append(Env.NL).append("DELETE ").append(TableName)
@@ -156,14 +150,6 @@ public class Merge
 				}
 				
 			}
-			//
-			if ( success )
-				success = m_trx.commit();
-			else
-				m_trx.rollback();
-			
-			m_trx.close();
-
 		}
 		catch (Exception ex)
 		{
@@ -172,6 +158,14 @@ public class Merge
 		}
 		finally
 		{
+			//
+			if (m_trx != null) {
+				if (success)
+					success = m_trx.commit();
+				else
+					m_trx.rollback();
+				m_trx.close();
+			}
 			DB.close(rs, pstmt);
 			rs = null;
 			pstmt = null;
@@ -214,11 +208,8 @@ public class Merge
 		}
 
 		int count = DB.executeUpdate(sql, m_trx.getTrxName());
-        
-		
-		if (  count < 0 )
+		if (count < 0)
 		{
-					
 			count = -1;
 			m_errorLog.append(Env.NL)
 				.append(delete ? "DELETE " : "UPDATE ")
@@ -226,12 +217,10 @@ public class Merge
 				.append(" - ").append(sql);
 			if (log.isLoggable(Level.CONFIG)) log.config(m_errorLog.toString());
 			m_trx.rollback();
-		
 		}
 		if (log.isLoggable(Level.FINE)) log.fine(count
 				+ (delete ? " -Delete- " : " -Update- ") + TableName);
-		
-		
+
 		return count;
 	}	//	mergeTable