You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by do...@apache.org on 2012/05/29 05:55:12 UTC
svn commit: r1343470 -
/ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java
Author: doogie
Date: Tue May 29 03:55:11 2012
New Revision: 1343470
URL: http://svn.apache.org/viewvc?rev=1343470&view=rev
Log:
FIX: Now that TransactionUtil.doNewTransaction is fixed to actually
work, back out the incorrect fix done in 1343088.
Modified:
ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java
Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java?rev=1343470&r1=1343469&r2=1343470&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java (original)
+++ ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java Tue May 29 03:55:11 2012
@@ -5601,9 +5601,7 @@ public class OrderServices {
}
final EntityCondition cond = EntityCondition.makeCondition(orderCondList);
List<String> orderIds;
- boolean beganTransaction = false;
try {
- beganTransaction = TransactionUtil.begin();
orderIds = TransactionUtil.doNewTransaction(new Callable<List<String>>() {
public List<String> call() throws Exception {
List<String> orderIds = new LinkedList<String>();
@@ -5624,18 +5622,7 @@ public class OrderServices {
}, "getSalesOrderIds", 0, true);
} catch (GenericEntityException e) {
Debug.logError(e, module);
- try {
- TransactionUtil.rollback(beganTransaction, e.getMessage(), e);
- } catch (GenericTransactionException e2) {
- Debug.logError(e2, "Unable to rollback transaction", module);
- }
return ServiceUtil.returnError(e.getMessage());
- } finally {
- try {
- TransactionUtil.commit(beganTransaction);
- } catch (GenericTransactionException e) {
- Debug.logError(e, "Unable to commit transaction", module);
- }
}
for (String orderId: orderIds) {