Author: bleny Date: 2011-07-21 10:15:51 +0000 (Thu, 21 Jul 2011) New Revision: 1379 Log: only a single final commit when importing sampling plan Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java 2011-07-19 13:24:33 UTC (rev 1378) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java 2011-07-21 10:15:51 UTC (rev 1379) @@ -262,7 +262,11 @@ @Override protected void executeCreateUpdateSampleRow(TopiaContext transaction, SampleRow row, List<Boat> boats, SampleRowLog rowLog, ConnectedUser connectedUser) throws TopiaException, WaoBusinessException { + createUpdateSampleRowWithoutCommit(transaction, row, boats, rowLog, connectedUser); + transaction.commitTransaction(); + } + protected void createUpdateSampleRowWithoutCommit(TopiaContext transaction, SampleRow row, List<Boat> boats, SampleRowLog rowLog, ConnectedUser connectedUser) throws TopiaException, WaoBusinessException { // prepare some stuffs for persistence if (row.getSampleMonth() != null) { for (SampleMonth sampleMonth : row.getSampleMonth()) { @@ -441,9 +445,6 @@ dao.update(oldRow); } - - transaction.commitTransaction(); - } /** @@ -1117,7 +1118,7 @@ SampleRowLog sampleRowLog = executeGetNewSampleRowLog(sampleRow, connectedUser); String logComment = WaoUtils._("csv.import.logComment"); sampleRowLog.setComment(logComment); - executeCreateUpdateSampleRow(transaction, sampleRow, new ArrayList<Boat>(), sampleRowLog, connectedUser); + createUpdateSampleRowWithoutCommit(transaction, sampleRow, new ArrayList<Boat>(), sampleRowLog, connectedUser); result.incNbImported(); timeLog.log(startUpdateDatabase, "end update database");