From 5fc4899d072a8bbb6da2dbcef47557346dc069c7 Mon Sep 17 00:00:00 2001 From: Samuel Halls Date: Fri, 24 May 2019 10:51:17 +0100 Subject: [PATCH] Added error message denoting timeout errors. --- pom.xml | 2 +- src/main/java/com/lindar/dotmailer/api/AbstractResource.java | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e95bf3f..574d6ba 100644 --- a/pom.xml +++ b/pom.xml @@ -55,7 +55,7 @@ com.lindar well-rested-client - 1.5.5 + 1.6.0 diff --git a/src/main/java/com/lindar/dotmailer/api/AbstractResource.java b/src/main/java/com/lindar/dotmailer/api/AbstractResource.java index 683fa6b..02eb40f 100644 --- a/src/main/java/com/lindar/dotmailer/api/AbstractResource.java +++ b/src/main/java/com/lindar/dotmailer/api/AbstractResource.java @@ -261,6 +261,9 @@ private boolean validBlankResponse(WellRestedResponse response) { private Result parseErrorResponse(WellRestedResponse response) { ErrorResponse errorResponse = response.fromJson().castTo(ErrorResponse.class); if (errorResponse == null || errorResponse.getMessage() == null || StringUtils.isBlank(errorResponse.getMessage())) { + if(response.isConnectionTimeout() || response.isSocketTimeout()) { + return ResultBuilder.failed().msg("Timeout Error").code("TIMEOUT_ERROR").buildAndIgnoreData(); + } return ResultBuilder.failed().msg("Unknown Error").code("UNKNOWN_ERROR").buildAndIgnoreData(); }