From 5d250a03be89f0e3601d2c17ce786e02f6bd1e3f Mon Sep 17 00:00:00 2001 From: Jonathan Philip Knoblauch Date: Fri, 12 Aug 2016 14:28:25 +0200 Subject: [PATCH] Refactoring for error handler Signed-off-by: Jonathan Philip Knoblauch --- .../ui/components/HawkbitUIErrorHandler.java | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/components/HawkbitUIErrorHandler.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/components/HawkbitUIErrorHandler.java index 229f85bf5..964ed3646 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/components/HawkbitUIErrorHandler.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/components/HawkbitUIErrorHandler.java @@ -41,19 +41,22 @@ public class HawkbitUIErrorHandler extends DefaultErrorHandler { public void error(final ErrorEvent event) { final Optional originError = getPageOriginError(event); - final HawkbitErrorNotificationMessage message = buildNotification(getRootExceptionFrom(event)); - if (originError.isPresent()) { + if (!originError.isPresent()) { + HawkbitErrorNotificationMessage.show(message.getCaption(), message.getDescription(), + Type.HUMANIZED_MESSAGE); + return; + } + + if (event instanceof ConnectorErrorEvent) { final Connector connector = ((ConnectorErrorEvent) event).getConnector(); if (connector instanceof UI) { ((UI) connector).access(() -> message.show(originError.get())); return; } - message.show(originError.get()); - return; } - HawkbitErrorNotificationMessage.show(message.getCaption(), message.getDescription(), Type.HUMANIZED_MESSAGE); + message.show(originError.get()); } private static Throwable getRootExceptionFrom(final ErrorEvent event) {