Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Correct external application properties load order
Fixes gh-24308
  • Loading branch information
mbhave committed Dec 3, 2020
1 parent 6c6e339 commit 932fb65
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
Expand Up @@ -638,8 +638,8 @@ For example, if `spring.config.additional-location` is configured with the value
. `optional:classpath:/`
. `optional:classpath:/config/`
. `optional:file:./`
. `optional:file:./config/*/`
. `optional:file:./config/`
. `optional:file:./config/*/`
. `optional:classpath:custom-config/`
. `optional:file:./custom-config/`

Expand Down
Expand Up @@ -90,8 +90,8 @@ class ConfigDataEnvironment {
locations.add(ConfigDataLocation.of("optional:classpath:/"));
locations.add(ConfigDataLocation.of("optional:classpath:/config/"));
locations.add(ConfigDataLocation.of("optional:file:./"));
locations.add(ConfigDataLocation.of("optional:file:./config/*/"));
locations.add(ConfigDataLocation.of("optional:file:./config/"));
locations.add(ConfigDataLocation.of("optional:file:./config/*/"));
DEFAULT_SEARCH_LOCATIONS = locations.toArray(new ConfigDataLocation[0]);
};

Expand Down

0 comments on commit 932fb65

Please sign in to comment.