jmcnally 2002/06/22 11:28:18
Modified: src/templates/om Object.vm ObjectWithManager.vm
Log:
patch by Stephen Haberman <[EMAIL PROTECTED]>
In the generated save method, if an error occurs,
BasePeer.rollBackTransaction is called. However, if an error occurs in
the rollBackTransaction, the user loses anything about the original
error and only sees the rollBackEx.
Ignores the rollBackEx and just returns the
original exception from save
Revision Changes Path
1.35 +8 -1 jakarta-turbine-torque/src/templates/om/Object.vm
Index: Object.vm
===================================================================
RCS file: /home/cvs/jakarta-turbine-torque/src/templates/om/Object.vm,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- Object.vm 20 Jun 2002 23:55:14 -0000 1.34
+++ Object.vm 22 Jun 2002 18:28:18 -0000 1.35
@@ -832,7 +832,14 @@
}
catch(TorqueException e)
{
- BasePeer.rollBackTransaction(con);
+ try
+ {
+ BasePeer.rollBackTransaction(con);
+ }
+ catch (Exception rollBackEx)
+ {
+ // Ignore because we've already got an exception
+ }
throw e;
}
BasePeer.commitTransaction(con);
1.13 +8 -1 jakarta-turbine-torque/src/templates/om/ObjectWithManager.vm
Index: ObjectWithManager.vm
===================================================================
RCS file: /home/cvs/jakarta-turbine-torque/src/templates/om/ObjectWithManager.vm,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ObjectWithManager.vm 20 Jun 2002 23:55:14 -0000 1.12
+++ ObjectWithManager.vm 22 Jun 2002 18:28:18 -0000 1.13
@@ -836,7 +836,14 @@
}
catch(TorqueException e)
{
- BasePeer.rollBackTransaction(con);
+ try
+ {
+ BasePeer.rollBackTransaction(con);
+ }
+ catch (Exception rollBackEx)
+ {
+ // Ignore because we've already got an exception
+ }
throw e;
}
BasePeer.commitTransaction(con);
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
