suppress another irrelevant message and fix nullpointerexception in S…

…oundsService.java
xspanger3770 · Nov 10, 2023 · 0a7cb32 · 0a7cb32
1 parent f9f2666
commit 0a7cb32
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/GlobalQuakeClient/src/main/java/globalquake/sounds/SoundsService.java b/GlobalQuakeClient/src/main/java/globalquake/sounds/SoundsService.java
@@ -43,6 +43,10 @@ public void onQuakeUpdate(QuakeUpdateEvent event) {
 
     private void checkSounds() {
         try {
+            if(GlobalQuake.instance.getClusterAnalysis() == null ||GlobalQuake.instance.getEarthquakeAnalysis() == null){
+                return;
+            }
+
             for (Cluster cluster : GlobalQuake.instance.getClusterAnalysis().getClusters()) {
                 determineSounds(cluster);
             }

diff --git a/GlobalQuakeCore/src/main/java/globalquake/core/database/StationDatabaseManager.java b/GlobalQuakeCore/src/main/java/globalquake/core/database/StationDatabaseManager.java
@@ -6,6 +6,7 @@
 import org.tinylog.Logger;
 
 import java.io.*;
+import java.net.ConnectException;
 import java.net.SocketTimeoutException;
 import java.time.LocalDateTime;
 import java.util.Iterator;
@@ -207,7 +208,9 @@ public void runAvailabilityCheck(List<SeedlinkNetwork> toBeUpdated, Runnable onF
                                 Callable<Void> task = () -> {
                                     try {
                                         SeedlinkCommunicator.runAvailabilityCheck(seedlinkNetwork, stationDatabase);
-                                    }catch(Exception e){
+                                    } catch(ConnectException ce){
+                                        Logger.trace(ce);
+                                    } catch(Exception e){
                                         Logger.error(e);
                                     }
                                     return null;