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 2017/09/14 16:07:03 UTC
[1/2] isis git commit: ISIS-1716: reverts change in 1.15.0;
now propogate exception if aborted, to redirect to error page.
Repository: isis
Updated Branches:
refs/heads/master 835e8b765 -> ce866aaa3
ISIS-1716: reverts change in 1.15.0; now propogate exception if aborted, to redirect to error page.
In 1.15.0, exceptions swallowed silently
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/b2ebb685
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/b2ebb685
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/b2ebb685
Branch: refs/heads/master
Commit: b2ebb6852cb7156a7cc8ddcbc854e5d052af906a
Parents: 835e8b7
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Thu Sep 14 17:04:11 2017 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Thu Sep 14 17:04:11 2017 +0100
----------------------------------------------------------------------
.../transaction/IsisTransactionManager.java | 26 +++++++++++---------
1 file changed, 15 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/b2ebb685/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 1ac8a24..521b8d7 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
@@ -336,27 +336,31 @@ public class IsisTransactionManager implements SessionScopedComponent {
// just in case any different exception was raised...
abortCause = this.getCurrentTransaction().getAbortCause();
+
} catch(RuntimeException ex) {
- // ... or, capture this most recent exception
abortCause = ex;
+
}
if(abortCause != null) {
+
+ // re-introduced the throwing of exceptions in 1.15.1 (same as 1.14.x)
+
+ // in 1.15.0 we were not throwing exceptions at this point, resulting in JDOUserException errors
+ // (eg malformed SQL) simply being silently ignored
+
+ // the reason that no exceptions were being thrown in 1.15.0 was because it was observed that
+ // throwing exceptions always resulted in forwarding to the error page, even if the error had been
+ // recognised at the UI layer. This was the rationale given, at least.
//
- // previously (<1.15.0) we threw this exception.
- // however, this results in an attempt to forward onto the error page, even if the error has been
- // recognised at the UI layer.
- //
- // so instead we just return (mirroring DataNucleus' own logic on a failed attempt to abort, namely
- // to just ignore the attempt to abort and carry on.)
- //
- // (have also manually verified that if the exception is NOT recognized by the UI layer, then the
- // exception does propagate to the top and we redirect to the error page correctly).
+ // Not certain now it is correct; if it was to improve the UI experience.
//
+ // Certainly swallowing severe exceptions is much less acceptable. Therefore reverting.
+
+ throw abortCause;
- return;
} else {
// assume that any rendering of the problem has been done lower down the stack.
[2/2] isis git commit: ISIS-1718: upgrades Jetty to 9.4.3
Posted by da...@apache.org.
ISIS-1718: upgrades Jetty to 9.4.3
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/ce866aaa
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/ce866aaa
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/ce866aaa
Branch: refs/heads/master
Commit: ce866aaa3a267341c6fcc142b95de32efbe2850f
Parents: b2ebb68
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Thu Sep 14 17:05:32 2017 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Thu Sep 14 17:05:32 2017 +0100
----------------------------------------------------------------------
core/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/ce866aaa/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 1911ebd..f562d79 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -137,7 +137,7 @@
<log4jdbc-remix.version>0.2.7</log4jdbc-remix.version>
<resteasy-jaxrs.version>3.0.17.Final</resteasy-jaxrs.version>
- <jetty.version>9.3.10.v20160621</jetty.version>
+ <jetty.version>9.4.3.v20170317</jetty.version>
<wicket.version>7.7.0</wicket.version>
<wicketstuff.version>7.7.0</wicketstuff.version>