@@ -360,11 +360,10 @@ protected boolean shouldCalculateUsageRecord(AccountVO accountVO, UsageVO usageR
360360
361361 @ Override
362362 public boolean findConfigurationValue (AccountVO accountVO , ConfigKey <Boolean > key ) {
363- boolean result = Boolean .parseBoolean (getConfigValueOrDefaultValue (key ));
364363 logger .trace ("Searching configuration [{}] of account [{}] in its settings." , key .key (), accountVO );
365364 AccountDetailVO accountDetail = accountDetailsDao .findDetail (accountVO .getAccountId (), key .key ());
366365 if (accountDetail != null ) {
367- result = Boolean .parseBoolean (accountDetail .getValue ());
366+ boolean result = Boolean .parseBoolean (accountDetail .getValue ());
368367 logger .trace ("Using value [{}] found in account [{}] settings to configuration [{}]." , result , accountVO , key .key ());
369368 return result ;
370369 }
@@ -373,11 +372,12 @@ public boolean findConfigurationValue(AccountVO accountVO, ConfigKey<Boolean> ke
373372 logger .trace ("Searching for configuration [{}] of account [{}] in its domain [{}] settings." , key .key (), accountVO , accountVO .getDomainId ());
374373 DomainDetailVO domainDetail = domainDetailsDao .findDetail (accountVO .getDomainId (), key .key ());
375374 if (domainDetail != null ) {
376- result = Boolean .parseBoolean (domainDetail .getValue ());
375+ boolean result = Boolean .parseBoolean (domainDetail .getValue ());
377376 logger .trace ("Using value [{}] found in domain [{}] settings to configuration [{}]." , result , accountVO .getDomainId (), key .key ());
378377 return result ;
379378 }
380379 }
380+ boolean result = Boolean .parseBoolean (getConfigValueOrDefaultValue (key ));
381381 logger .trace ("Using default value [{}] to configuration [{}]." , result , key .key ());
382382 return result ;
383383 }
0 commit comments