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 2019/12/07 13:06:58 UTC
[isis] 01/02: ISIS-2189: further minor polishing
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 1875ef3ce58974f9160e00c7d2530c70eb524a4e
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Sat Dec 7 12:35:47 2019 +0000
ISIS-2189: further minor polishing
---
.../main/java/org/apache/isis/applib/services/health/Health.java | 6 +++---
.../isis/webapp/health/HealthIndicatorUsingHealthCheckService.java | 7 ++++++-
2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/health/Health.java b/core/applib/src/main/java/org/apache/isis/applib/services/health/Health.java
index 0315553..76cad7d 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/health/Health.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/health/Health.java
@@ -35,11 +35,11 @@ public class Health {
@Getter
private final String message;
@Getter
- private final Throwable throwable;
+ private final Throwable cause;
- private Health(final String message, Throwable throwable) {
+ private Health(final String message, Throwable cause) {
this.message = message;
- this.throwable = throwable;
+ this.cause = cause;
}
public boolean getResult() { return message == null; }
diff --git a/core/webapp/src/main/java/org/apache/isis/webapp/health/HealthIndicatorUsingHealthCheckService.java b/core/webapp/src/main/java/org/apache/isis/webapp/health/HealthIndicatorUsingHealthCheckService.java
index ad003ae..b44ac94 100644
--- a/core/webapp/src/main/java/org/apache/isis/webapp/health/HealthIndicatorUsingHealthCheckService.java
+++ b/core/webapp/src/main/java/org/apache/isis/webapp/health/HealthIndicatorUsingHealthCheckService.java
@@ -34,7 +34,12 @@ public class HealthIndicatorUsingHealthCheckService extends AbstractHealthIndica
if(result) {
builder.up();
} else {
- builder.down(health.getThrowable());
+ final Throwable cause = health.getCause();
+ if(cause != null) {
+ builder.down(cause);
+ } else {
+ builder.down();
+ }
}
} else {
builder.unknown();