From d4f61bd646eb52746c2d0d35743fad00cabd1ec2 Mon Sep 17 00:00:00 2001 From: William Date: Tue, 26 Dec 2023 12:38:07 +0000 Subject: [PATCH] refactor: catch `Throwable`, not `Exception` --- .../java/net/william278/husksync/migrator/MpdbMigrator.java | 2 +- .../src/main/java/net/william278/husksync/util/DataDumper.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bukkit/src/main/java/net/william278/husksync/migrator/MpdbMigrator.java b/bukkit/src/main/java/net/william278/husksync/migrator/MpdbMigrator.java index c4850dde..cbcaedb1 100644 --- a/bukkit/src/main/java/net/william278/husksync/migrator/MpdbMigrator.java +++ b/bukkit/src/main/java/net/william278/husksync/migrator/MpdbMigrator.java @@ -143,7 +143,7 @@ public class MpdbMigrator extends Migrator { }); plugin.log(Level.INFO, "Migration complete for " + dataToMigrate.size() + " users in " + ((System.currentTimeMillis() - startTime) / 1000) + " seconds!"); return true; - } catch (Exception e) { + } catch (Throwable e) { plugin.log(Level.SEVERE, "Error while migrating data: " + e.getMessage() + " - are your source database credentials correct?"); return false; } diff --git a/common/src/main/java/net/william278/husksync/util/DataDumper.java b/common/src/main/java/net/william278/husksync/util/DataDumper.java index 44ee1092..f0f510a1 100644 --- a/common/src/main/java/net/william278/husksync/util/DataDumper.java +++ b/common/src/main/java/net/william278/husksync/util/DataDumper.java @@ -115,7 +115,7 @@ public class DataDumper { } else { return "(Failed to upload to logs site, got: " + connection.getResponseCode() + ")"; } - } catch (Exception e) { + } catch (Throwable e) { plugin.log(Level.SEVERE, "Failed to upload data to logs site", e); } return "(Failed to upload to logs site)";