Merge pull request #440 from tjtanjin/fix-null-exception

Fix: fix a bug where null exception results in looping gif
AY2021S2-CS2103T-T12-4 · Mar 30, 2021 · 73e84d4 · 73e84d4
2 parents f4a6dab + 2ddf6f4
commit 73e84d4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/main/java/seedu/us/among/logic/request/EndpointCaller.java b/src/main/java/seedu/us/among/logic/request/EndpointCaller.java
@@ -81,7 +81,7 @@ public Response callEndpoint() throws RequestException, AbortRequestException {
             } else {
                 throw new AbortRequestException(MESSAGE_CONNECTION_ERROR);
             }
-        } catch (IOException e) {
+        } catch (Exception e) {
             logger.warning(StringUtil.getDetails(e));
             throw new RequestException(MESSAGE_GENERAL_ERROR);
         } finally {

diff --git a/src/main/java/seedu/us/among/logic/request/Request.java b/src/main/java/seedu/us/among/logic/request/Request.java
@@ -106,7 +106,8 @@ private String formatEntity(HttpEntity entity) throws IOException {
         String responseEntity = "";
         if (entity != null) {
             responseEntity = EntityUtils.toString(entity);
-            if (entity.getContentType().getValue().toLowerCase().contains("application/json")) {
+            if (entity.getContentType() != null
+                    && entity.getContentType().getValue().toLowerCase().contains("application/json")) {
                 responseEntity = JsonUtil.toPrettyPrintJsonString(responseEntity);
             }
         }