[iCalendar] Fix httpclient getting stuck with broken requests (openha…

…b#11866) * [iCalendar] Fix httpclient getting stuck with broken requests Fixes openhab#9827 Signed-off-by: Stefan Triller <github@stefantriller.de> Signed-off-by: Andras Uhrin <andras.uhrin@gmail.com>
andrasU · Nov 12, 2022 · 4ba6a99 · 4ba6a99
1 parent ffbbcb6
commit 4ba6a99
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/...nding.icalendar/src/main/java/org/openhab/binding/icalendar/internal/handler/PullJob.java b/...nding.icalendar/src/main/java/org/openhab/binding/icalendar/internal/handler/PullJob.java
@@ -102,22 +102,25 @@ public void run() {
         try {
             response = asyncListener.get(HTTP_TIMEOUT_SECS, TimeUnit.SECONDS);
         } catch (InterruptedException e1) {
-            logger.warn("Download of calendar was interrupted.");
-            logger.debug("InterruptedException message is: {}", e1.getMessage());
+            logger.warn("Download of calendar was interrupted: {}", e1.getMessage());
+            request.abort(e1.getCause() != null ? e1.getCause() : e1);
             return;
         } catch (TimeoutException e1) {
-            logger.warn("Download of calendar timed out (waited too long for headers).");
-            logger.debug("TimeoutException message is: {}", e1.getMessage());
+            logger.warn("Download of calendar timed out (waited too long for headers): {}", e1.getMessage());
+            request.abort(e1.getCause() != null ? e1.getCause() : e1);
             return;
         } catch (ExecutionException e1) {
-            logger.warn("Download of calendar failed.");
-            logger.debug("ExecutionException message is: {}", e1.getCause().getMessage());
+            String msg = e1.getCause() != null ? e1.getCause().getMessage() : "";
+            logger.warn("Download of calendar failed with ExecutionException: {}", msg);
+            request.abort(e1.getCause() != null ? e1.getCause() : e1);
             return;
         }
 
         if (response.getStatus() != HttpStatus.OK_200) {
             logger.warn("Response status for getting \"{}\" was {} instead of 200. Ignoring it.", sourceURI,
                     response.getStatus());
+            request.abort(new IllegalStateException(
+                    "Got response status " + response.getStatus() + " while requesting " + sourceURI));
             return;
         }