Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Save time by not inspecting configuration for property when in PropertiesDelegate #5364

Merged
merged 1 commit into from
Jul 13, 2023
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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