Author: jpepin Date: 2010-05-27 17:16:22 +0200 (Thu, 27 May 2010) New Revision: 2915 Url: http://chorem.org/repositories/revision/lima/2915 Log: Move begin transaction & commit in methods (bis) Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/AccountServiceImpl.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/EntryBookServiceImpl.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialPeriodServiceImpl.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FiscalPeriodServiceImpl.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ReportServiceImpl.java Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/AccountServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/AccountServiceImpl.java 2010-05-27 15:06:34 UTC (rev 2914) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/AccountServiceImpl.java 2010-05-27 15:16:22 UTC (rev 2915) @@ -379,21 +379,24 @@ } } - protected void commitTransaction(TopiaContext transaction) throws TopiaException { + protected TopiaContext beginTransaction() throws TopiaException { + // basic check done, make check in database + // TODO move it into JTA + TopiaContext topiaTransaction; + topiaTransaction = rootContext.beginTransaction(); + log.trace("beginTransaction"+topiaTransaction); + return topiaTransaction; + } + + protected void commitTransaction(TopiaContext topiaTransaction) throws TopiaException { try { - transaction.commitTransaction(); + topiaTransaction.commitTransaction(); } catch (TopiaException eee) { if (log.isErrorEnabled()) { log.error("Error during commit context", eee); } + throw eee; } } - protected TopiaContext beginTransaction() throws TopiaException { - TopiaContext transaction; - // basic check done, make check in database - // TODO move it into JTA - transaction = rootContext.beginTransaction(); - return transaction; - } } \ No newline at end of file Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/EntryBookServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/EntryBookServiceImpl.java 2010-05-27 15:06:34 UTC (rev 2914) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/EntryBookServiceImpl.java 2010-05-27 15:16:22 UTC (rev 2915) @@ -219,21 +219,24 @@ } } - protected void commitTransaction(TopiaContext transaction) throws TopiaException { + protected TopiaContext beginTransaction() throws TopiaException { + // basic check done, make check in database + // TODO move it into JTA + TopiaContext topiaTransaction; + topiaTransaction = rootContext.beginTransaction(); + log.trace("beginTransaction"+topiaTransaction); + return topiaTransaction; + } + + protected void commitTransaction(TopiaContext topiaTransaction) throws TopiaException { try { - transaction.commitTransaction(); + topiaTransaction.commitTransaction(); } catch (TopiaException eee) { if (log.isErrorEnabled()) { log.error("Error during commit context", eee); } + throw eee; } } - - protected TopiaContext beginTransaction() throws TopiaException { - TopiaContext transaction; - // basic check done, make check in database - // TODO move it into JTA - transaction = rootContext.beginTransaction(); - return transaction; - } + } Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialPeriodServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialPeriodServiceImpl.java 2010-05-27 15:06:34 UTC (rev 2914) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialPeriodServiceImpl.java 2010-05-27 15:16:22 UTC (rev 2915) @@ -357,22 +357,24 @@ return result; } - protected void commitTransaction(TopiaContext transaction) throws TopiaException { + protected TopiaContext beginTransaction() throws TopiaException { + // basic check done, make check in database + // TODO move it into JTA + TopiaContext topiaTransaction; + topiaTransaction = rootContext.beginTransaction(); + log.trace("beginTransaction"+topiaTransaction); + return topiaTransaction; + } + + protected void commitTransaction(TopiaContext topiaTransaction) throws TopiaException { try { - transaction.commitTransaction(); + topiaTransaction.commitTransaction(); } catch (TopiaException eee) { if (log.isErrorEnabled()) { log.error("Error during commit context", eee); } + throw eee; } } - protected TopiaContext beginTransaction() throws TopiaException { - TopiaContext topiaTransaction; - // basic check done, make check in database - // TODO move it into JTA - topiaTransaction = rootContext.beginTransaction(); - return topiaTransaction; - } - } Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java 2010-05-27 15:06:34 UTC (rev 2914) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java 2010-05-27 15:16:22 UTC (rev 2915) @@ -384,21 +384,23 @@ } } - protected void commitTransaction(TopiaContext topiaContext) throws TopiaException { + protected TopiaContext beginTransaction() throws TopiaException { + // basic check done, make check in database + // TODO move it into JTA + TopiaContext topiaTransaction; + topiaTransaction = rootContext.beginTransaction(); + log.trace("beginTransaction"+topiaTransaction); + return topiaTransaction; + } + + protected void commitTransaction(TopiaContext topiaTransaction) throws TopiaException { try { - topiaContext.commitTransaction(); + topiaTransaction.commitTransaction(); } catch (TopiaException eee) { if (log.isErrorEnabled()) { log.error("Error during commit context", eee); } + throw eee; } } - - protected TopiaContext beginTransaction() throws TopiaException { - TopiaContext topiaContext; - // basic check done, make check in database - // TODO move it into JTA - topiaContext = rootContext.beginTransaction(); - return topiaContext; - } } \ No newline at end of file Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FiscalPeriodServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FiscalPeriodServiceImpl.java 2010-05-27 15:06:34 UTC (rev 2914) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FiscalPeriodServiceImpl.java 2010-05-27 15:16:22 UTC (rev 2915) @@ -276,20 +276,22 @@ } protected TopiaContext beginTransaction() throws TopiaException { - TopiaContext transaction; // basic check done, make check in database // TODO move it into JTA - transaction = rootContext.beginTransaction(); - return transaction; + TopiaContext topiaTransaction; + topiaTransaction = rootContext.beginTransaction(); + log.trace("beginTransaction"+topiaTransaction); + return topiaTransaction; } - - protected void commitTransaction(TopiaContext transaction) throws TopiaException { + + protected void commitTransaction(TopiaContext topiaTransaction) throws TopiaException { try { - transaction.commitTransaction(); + topiaTransaction.commitTransaction(); } catch (TopiaException eee) { if (log.isErrorEnabled()) { log.error("Error during commit context", eee); } + throw eee; } } Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ReportServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ReportServiceImpl.java 2010-05-27 15:06:34 UTC (rev 2914) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ReportServiceImpl.java 2010-05-27 15:16:22 UTC (rev 2915) @@ -386,8 +386,11 @@ } protected TopiaContext beginTransaction() throws TopiaException { + // basic check done, make check in database + // TODO move it into JTA TopiaContext topiaTransaction; topiaTransaction = rootContext.beginTransaction(); + log.trace("beginTransaction"+topiaTransaction); return topiaTransaction; } @@ -398,6 +401,8 @@ if (log.isErrorEnabled()) { log.error("Error during commit context", eee); } + throw eee; } } + }