From 088b177c0e7069091ecfe920cf8425676e9a6c04 Mon Sep 17 00:00:00 2001 From: Armin Schrenk Date: Thu, 15 Jan 2026 15:11:46 +0100 Subject: [PATCH] Ensure that null map is also logged --- .../java/org/cryptomator/launcher/AdminPropertiesSetter.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/cryptomator/launcher/AdminPropertiesSetter.java b/src/main/java/org/cryptomator/launcher/AdminPropertiesSetter.java index 30dcd241d..36c7dd247 100644 --- a/src/main/java/org/cryptomator/launcher/AdminPropertiesSetter.java +++ b/src/main/java/org/cryptomator/launcher/AdminPropertiesSetter.java @@ -95,9 +95,10 @@ class AdminPropertiesSetter { private static Map loadAdminProperties(Path adminPropertiesPath) { try (var in = Files.newInputStream(adminPropertiesPath, StandardOpenOption.READ)) { var map = JSON.readValue(in, new TypeReference>() {}); - if (map != null) { - return map; + if (map == null) { + throw new NullPointerException("JSON parsing returned null"); } + return map; } catch (NoSuchFileException _) { //NO-OP log("No admin properties found at {}.", List.of(adminPropertiesPath));