You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2013/06/20 23:12:17 UTC
git commit: ISIS-442: further fix for IsisTransactionManager
Updated Branches:
refs/heads/master 4ec5d85db -> 14de691ed
ISIS-442: further fix for IsisTransactionManager
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/14de691e
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/14de691e
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/14de691e
Branch: refs/heads/master
Commit: 14de691ede58eff047e4b879d1719f72e4806763
Parents: 4ec5d85
Author: Dan Haywood <da...@apache.org>
Authored: Thu Jun 20 21:45:24 2013 +0100
Committer: Dan Haywood <da...@apache.org>
Committed: Thu Jun 20 21:45:24 2013 +0100
----------------------------------------------------------------------
.../runtime/system/transaction/IsisTransactionManager.java | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/14de691e/core/runtime/src/main/java/org/apache/isis/core/runtime/system/transaction/IsisTransactionManager.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/transaction/IsisTransactionManager.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/transaction/IsisTransactionManager.java
index eafde13..4dac240 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/transaction/IsisTransactionManager.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/transaction/IsisTransactionManager.java
@@ -405,10 +405,9 @@ public class IsisTransactionManager implements SessionScopedComponent {
try {
abortTransaction();
} catch(RuntimeException ex) {
- // just in case any new exception was raised...
- abortCause = ex;
- transactionLevel = 1; // because the transactionLevel was decremented earlier
- getTransaction().setAbortCause(new IsisTransactionManagerException(ex));
+ // ignore; nothing to do:
+ // * we want the existing abortCause to be available
+ // * the transactionLevel is correctly now at 0.
}
throw abortCause;