midsuit
/
core-jgi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

IDEMPIERE-3017 CSV Importer leaving open trx (DB locks)

This commit is contained in:
Carlos Ruiz 2016-01-29 03:02:48 +01:00
parent 0c28fbc7b6
commit 7cbee09a69
1 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
org.adempiere.base/src/org/adempiere/impexp/GridTabCSVImporter.java
View File

@ -238,7 +238,7 @@ public class GridTabCSVImporter implements IGridTabImporter
createTrx(gridTab);
}
String recordResult = processRecord(importMode, gridTab, indxDetail, isDetail, idx, rowResult);
String recordResult = processRecord(importMode, gridTab, indxDetail, isDetail, idx, rowResult, childs);
rowResult.append(recordResult);
// write
@ -272,6 +272,13 @@ public class GridTabCSVImporter implements IGridTabImporter
} catch (IOException e) {
e.printStackTrace();
}
gridTab.getTableModel().setImportingMode(false,null);
for (GridTab detail : childs) {
detail.getTableModel().setImportingMode(false,null);
}
gridTab.dataRefreshAll();
}
if (logFile != null)
return logFile;
@ -521,6 +528,7 @@ public class GridTabCSVImporter implements IGridTabImporter
if( trx != null ){
if( isError() ) {
gridTab.dataDelete();
rollbackTrx();
setError(false);
}else {
@ -542,6 +550,7 @@ public class GridTabCSVImporter implements IGridTabImporter
}
if( isError ){
gridTab.dataDelete();
rollbackTrx();
}else{
commitTrx();
@ -551,18 +560,6 @@ public class GridTabCSVImporter implements IGridTabImporter
}
}
if( childs != null ){
if( masterRecord != null ){
gridTab.query(false);
gridTab.getTableModel().setImportingMode(false,null);
for( GridTab detail : childs )
if( detail.getTableModel().isOpen() ){
detail.query(true);
detail.getTableModel().setImportingMode(false,null);
}
}
}
trx.close();
trx=null;
}
@ -597,7 +594,7 @@ public class GridTabCSVImporter implements IGridTabImporter
* @param rowResult
* @return
*/
private String processRecord(String importMode, GridTab gridTab, int indxDetail, boolean isDetail, int idx, StringBuilder rowResult){
private String processRecord(String importMode, GridTab gridTab, int indxDetail, boolean isDetail, int idx, StringBuilder rowResult, List<GridTab> childs){
String logMsg = null;
GridTab currentGridTab = null;
@ -633,6 +630,11 @@ public class GridTabCSVImporter implements IGridTabImporter
logMsg = "["+currentGridTab.getName()+"]"+"- Was not able to create a new record!";
}else{
currentGridTab.navigateCurrent();
if (! isDetail) {
for (GridTab child : childs) {
child.query(false);
}
}
}
}