jmcnally 2002/06/22 11:34:07
Modified: src/templates/om Object.vm ObjectWithManager.vm
Log:
On second (actually third) thought, record the fact that the rollback
was attempted and failed. This might be important in reconstructing a
corrupted db or at least pointing to the fact that it may have occured.
Revision Changes Path
1.36 +5 -2 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.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- Object.vm 22 Jun 2002 18:28:18 -0000 1.35
+++ Object.vm 22 Jun 2002 18:34:07 -0000 1.36
@@ -838,9 +838,12 @@
}
catch (Exception rollBackEx)
{
- // Ignore because we've already got an exception
+ throw new TorqueException(e.getMessage()
+ + "; a rollback exception ocurred when rolling back the error:
"
+ + rollBackEx.getMessage(),
+ e);
}
- throw e;
+ throw e;
}
BasePeer.commitTransaction(con);
1.14 +5 -2 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.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ObjectWithManager.vm 22 Jun 2002 18:28:18 -0000 1.13
+++ ObjectWithManager.vm 22 Jun 2002 18:34:07 -0000 1.14
@@ -842,9 +842,12 @@
}
catch (Exception rollBackEx)
{
- // Ignore because we've already got an exception
+ throw new TorqueException(e.getMessage()
+ + "; a rollback exception ocurred when rolling back the error:
"
+ + rollBackEx.getMessage(),
+ e);
}
- throw e;
+ throw e;
}
BasePeer.commitTransaction(con);
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
