From f79d77578e9fe54f5e9c910f6563c71beaaf088b Mon Sep 17 00:00:00 2001 From: Jim Procter Date: Mon, 20 Sep 2021 14:54:50 +0100 Subject: [PATCH] JAL-3829 throw the exception even if it has no message --- .../threedbeacons/TDBeaconsFTSRestClient.java | 29 ++++++++++---------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/src/jalview/fts/service/threedbeacons/TDBeaconsFTSRestClient.java b/src/jalview/fts/service/threedbeacons/TDBeaconsFTSRestClient.java index 08edcdf..c05306a 100644 --- a/src/jalview/fts/service/threedbeacons/TDBeaconsFTSRestClient.java +++ b/src/jalview/fts/service/threedbeacons/TDBeaconsFTSRestClient.java @@ -127,22 +127,23 @@ public class TDBeaconsFTSRestClient extends FTSRestClient } catch (Exception e) { String exceptionMsg = e.getMessage(); - if (exceptionMsg.contains("SocketException")) + if (exceptionMsg != null) { - // No internet connection - throw new Exception(MessageManager.getString( - "exception.unable_to_detect_internet_connection")); - } - else if (exceptionMsg.contains("UnknownHostException")) - { - // The server is unreachable - throw new Exception(MessageManager.formatMessage( - "exception.fts_server_unreachable", "3DB Hub")); - } - else - { - throw e; + if (exceptionMsg.contains("SocketException")) + { + // No internet connection + throw new Exception(MessageManager.getString( + "exception.unable_to_detect_internet_connection")); + } + else if (exceptionMsg.contains("UnknownHostException")) + { + // The server is unreachable + throw new Exception(MessageManager.formatMessage( + "exception.fts_server_unreachable", "3DB Hub")); + } } + throw e; + } } -- 1.7.10.2