From 73893913eda0dbcda240ca23cdc555f3b16cfcd0 Mon Sep 17 00:00:00 2001 From: Giuseppe Villani Date: Mon, 19 Dec 2022 12:23:08 +0100 Subject: [PATCH] Fixes #3358: apoc extended on 5.2 throws errors for missing config values --- extended/src/main/java/apoc/TTLConfig.java | 2 +- extended/src/main/java/apoc/uuid/UuidHandler.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/extended/src/main/java/apoc/TTLConfig.java b/extended/src/main/java/apoc/TTLConfig.java index 71f6ee8e49..f3c34790a7 100644 --- a/extended/src/main/java/apoc/TTLConfig.java +++ b/extended/src/main/java/apoc/TTLConfig.java @@ -23,7 +23,7 @@ public Values configFor(GraphDatabaseAPI db) { String apocTTLEnabledDb = String.format(ExtendedApocConfig.APOC_TTL_ENABLED_DB, db.databaseName()); String apocTTLScheduleDb = String.format(ExtendedApocConfig.APOC_TTL_SCHEDULE_DB, db.databaseName()); String apocTTLLimitDb = String.format(ExtendedApocConfig.APOC_TTL_LIMIT_DB, db.databaseName()); - boolean enabled = apocConfig.getBoolean(ExtendedApocConfig.APOC_TTL_ENABLED); + boolean enabled = apocConfig.getBoolean(ExtendedApocConfig.APOC_TTL_ENABLED, false); boolean dbEnabled = apocConfig.getBoolean(apocTTLEnabledDb, enabled); if (dbEnabled) { diff --git a/extended/src/main/java/apoc/uuid/UuidHandler.java b/extended/src/main/java/apoc/uuid/UuidHandler.java index 91c590e4fc..4c734cdf15 100644 --- a/extended/src/main/java/apoc/uuid/UuidHandler.java +++ b/extended/src/main/java/apoc/uuid/UuidHandler.java @@ -67,7 +67,8 @@ public void start() { private boolean isEnabled() { String apocUUIDEnabledDb = String.format(APOC_UUID_ENABLED_DB, this.db.databaseName()); - return apocConfig.getConfig().getBoolean(apocUUIDEnabledDb, apocConfig.getBoolean(APOC_UUID_ENABLED)); + final boolean enabled = apocConfig.getBoolean(APOC_UUID_ENABLED, false); + return apocConfig.getConfig().getBoolean(apocUUIDEnabledDb, enabled); } @Override