Re: svn commit: r1343469 - /ofbiz/trunk/framework/entity/src/org/ofbiz/entity/transaction/TransactionUtil.java

[Adam Heath-2]

On 05/28/2012 10:55 PM, [hidden email] wrote:

> Author: doogie
> Date: Tue May 29 03:55:05 2012
> New Revision: 1343469
>
> URL: http://svn.apache.org/viewvc?rev=1343469&view=rev
> Log:
> FIX: This is the correct fix for 1343088;
> TransactionUtil.doNewTransaction was starting a new transaction, then
> immediately suspending it.  This caused confusion in calling code that
> tried to use doNewTransaction.  Fortunately, this was not used very
> much,

I need to backport this to 12.04.  I'll get around to it when I backport
the rest of the deprecation code.

>
> Modified:
>      ofbiz/trunk/framework/entity/src/org/ofbiz/entity/transaction/TransactionUtil.java
>
> Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/transaction/TransactionUtil.java
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/transaction/TransactionUtil.java?rev=1343469&r1=1343468&r2=1343469&view=diff
> ==============================================================================
> --- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/transaction/TransactionUtil.java (original)
> +++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/transaction/TransactionUtil.java Tue May 29 03:55:05 2012
> @@ -78,16 +78,16 @@ public class TransactionUtil implements
>
>       @Deprecated
>       public static<V>  V doNewTransaction(String ifErrorMessage, Callable<V>  callable) throws GenericEntityException {
> -        return inTransaction(noTransaction(callable), ifErrorMessage, 0, true).call();
> +        return noTransaction(inTransaction(callable, ifErrorMessage, 0, true)).call();
>       }
>
>       @Deprecated
>       public static<V>  V doNewTransaction(String ifErrorMessage, boolean printException, Callable<V>  callable) throws GenericEntityException {
> -        return inTransaction(noTransaction(callable), ifErrorMessage, 0, printException).call();
> +        return noTransaction(inTransaction(callable, ifErrorMessage, 0, printException)).call();
>       }
>
>       public static<V>  V doNewTransaction(Callable<V>  callable, String ifErrorMessage, int timeout, boolean printException) throws GenericEntityException {
> -        return inTransaction(noTransaction(callable), ifErrorMessage, timeout, printException).call();
> +        return noTransaction(inTransaction(callable, ifErrorMessage, timeout, printException)).call();
>       }
>
>       @Deprecated
>
>