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 2014/11/13 01:48:10 UTC
[2/2] isis git commit: ISIS-950: suppress stack trace in Wicket's
error page if exception is recognized.
ISIS-950: suppress stack trace in Wicket's error page if exception is recognized.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/0bca9b01
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/0bca9b01
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/0bca9b01
Branch: refs/heads/master
Commit: 0bca9b01b2b269a364c6a10c47af782336de5de2
Parents: f90a62e
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Thu Nov 13 00:41:36 2014 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Thu Nov 13 00:41:36 2014 +0000
----------------------------------------------------------------------
.../apache/isis/viewer/wicket/ui/errors/ExceptionModel.java | 3 +--
.../isis/viewer/wicket/ui/errors/ExceptionStackTracePanel.java | 6 +++---
2 files changed, 4 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/0bca9b01/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/ExceptionModel.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/ExceptionModel.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/ExceptionModel.java
index 91ca4c0..fbb4aed 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/ExceptionModel.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/ExceptionModel.java
@@ -19,10 +19,8 @@
package org.apache.isis.viewer.wicket.ui.errors;
import java.util.List;
-
import com.google.common.base.Throwables;
import com.google.common.collect.Lists;
-
import org.apache.isis.core.metamodel.spec.feature.ObjectMember;
import org.apache.isis.viewer.wicket.model.models.ModelAbstract;
@@ -106,6 +104,7 @@ public class ExceptionModel extends ModelAbstract<List<StackTraceDetail>> {
return authorizationCause;
}
+
public List<StackTraceDetail> getStackTrace() {
return stackTraceDetailList;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/0bca9b01/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/ExceptionStackTracePanel.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/ExceptionStackTracePanel.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/ExceptionStackTracePanel.java
index 0643eb4..7504c47 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/ExceptionStackTracePanel.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/ExceptionStackTracePanel.java
@@ -53,12 +53,12 @@ public class ExceptionStackTracePanel extends Panel {
add(label);
- final boolean authorizationException = exceptionModel.isAuthorizationException();
- if(authorizationException) {
+ final boolean suppressDetail = exceptionModel.isAuthorizationException() || exceptionModel.isRecognized();
+ if(suppressDetail) {
Components.permanentlyHide(this, ID_EXCEPTION_DETAIL);
} else {
- MarkupContainer container = new WebMarkupContainer(ID_EXCEPTION_DETAIL) {
+ MarkupContainer container = new WebMarkupContainer(ID_EXCEPTION_DETAIL) {
private static final long serialVersionUID = 1L;
@Override
public void renderHead(IHeaderResponse response) {