From a04043c1014d0c2ede0ef5792bec0d7a9a6d31f6 Mon Sep 17 00:00:00 2001 From: Minecon724 Date: Sun, 9 Jun 2024 15:53:06 +0200 Subject: [PATCH] fix exception throwing in init --- .../impl/openweathermap/OpenWeatherMapProvider.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/main/java/eu/m724/wtapi/provider/impl/openweathermap/OpenWeatherMapProvider.java b/src/main/java/eu/m724/wtapi/provider/impl/openweathermap/OpenWeatherMapProvider.java index c91a9a3..1af1cac 100644 --- a/src/main/java/eu/m724/wtapi/provider/impl/openweathermap/OpenWeatherMapProvider.java +++ b/src/main/java/eu/m724/wtapi/provider/impl/openweathermap/OpenWeatherMapProvider.java @@ -8,6 +8,7 @@ import java.net.http.HttpResponse; import java.net.http.HttpResponse.BodyHandlers; import java.util.ArrayList; import java.util.concurrent.CompletableFuture; +import java.util.concurrent.CompletionException; import java.util.concurrent.ExecutionException; import com.google.gson.JsonObject; @@ -36,11 +37,9 @@ public class OpenWeatherMapProvider extends WeatherProvider { getWeather(new Coordinates(0, 0)); try { - weatherFuture.get(); - } catch (InterruptedException e) { - throw new ProviderException("unexpected interruptedexception"); - } catch (ExecutionException e) { - throw (ProviderException) e.getSuppressed()[0]; // TODO + weatherFuture.join(); + } catch (CompletionException e) { + throw (ProviderException) e; } }