Merge pull request #3381 from lusarz/refactor-bisq-app-throwable

Refactor BisqApp - update error popup message build
bisq-network · Oct 14, 2019 · 4277ec8 · 4277ec8
2 parents 94b12a7 + 584e552
commit 4277ec8
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/desktop/src/main/java/bisq/desktop/app/BisqApp.java b/desktop/src/main/java/bisq/desktop/app/BisqApp.java
@@ -73,6 +73,7 @@
 import java.awt.GraphicsEnvironment;
 import java.awt.Rectangle;
 
+import java.util.Objects;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Consumer;
 
@@ -180,12 +181,10 @@ public void handleUncaughtException(Throwable throwable, boolean doShutDown) {
             try {
                 try {
                     if (!popupOpened) {
-                        String message = throwable.getMessage();
                         popupOpened = true;
-                        if (message != null)
-                            new Popup<>().error(message).onClose(() -> popupOpened = false).show();
-                        else
-                            new Popup<>().error(throwable.toString()).onClose(() -> popupOpened = false).show();
+                        new Popup<>().error(Objects.requireNonNullElse(throwable.getMessage(), throwable.toString()))
+                                .onClose(() -> popupOpened = false)
+                                .show();
                     }
                 } catch (Throwable throwable3) {
                     log.error("Error at displaying Throwable.");