Skip to content

Commit

Permalink
Fixes #3358: apoc extended on 5.2 throws errors for missing config va…
Browse files Browse the repository at this point in the history
…lues (#3374)
  • Loading branch information
vga91 authored Dec 19, 2022
1 parent 92f1d1c commit acebcdc
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion extended/src/main/java/apoc/TTLConfig.java
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
3 changes: 2 additions & 1 deletion extended/src/main/java/apoc/uuid/UuidHandler.java
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit acebcdc

Please sign in to comment.