Skip to content

Commit

Permalink
Save time by not inspecting configuration for property when in Proper…
Browse files Browse the repository at this point in the history
…tiesDelegate

Signed-off-by: jansupol <[email protected]>
  • Loading branch information
jansupol committed Jul 13, 2023
1 parent 30acc40 commit 3819184
Showing 1 changed file with 9 additions and 10 deletions.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2020 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2020, 2023 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0, which is available at
Expand Down Expand Up @@ -84,16 +84,15 @@ public <T> T resolveProperty(String name, T defaultValue) {
}

private <T> T resolveProperty(final String name, Object defaultValue, final Class<T> type) {
// Check runtime configuration first
Object result = configuration.getProperty(name);
if (result != null) {
defaultValue = result;
}

// Check request properties next
result = delegate.getProperty(name);
// Check request properties property
Object result = delegate.getProperty(name);
if (result == null) {
result = defaultValue;

// Check runtime configuration next
result = configuration.getProperty(name);
if (result == null) {
result = defaultValue;
}
}

return (result == null) ? null : PropertiesHelper.convertValue(result, type);
Expand Down

0 comments on commit 3819184

Please sign in to comment.