Skip to content

Commit

Permalink
framework: use "filePrefix" for relative config files @include
Browse files Browse the repository at this point in the history
Fixes: 4a43760 ("Add "filePrefix" parameter to play.PropertiesConfLoader")
  • Loading branch information
xabolcs committed Feb 10, 2025
1 parent bf6f6ac commit cfb15b1
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion framework/src/play/PropertiesConfLoader.java
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,8 @@ private void resolveIncludes(
for (Map.Entry<Object, Object> e : propsFromFile.entrySet()) {
if (e.getKey().toString().startsWith("@include.")) {
try {
String filenameToInclude = e.getValue().toString();
String value = e.getValue().toString();
String filenameToInclude = !value.startsWith("/") ? filePrefix + value : value;
propsFromFile.putAll(
readOneConfigurationFile(filenameToInclude, playId, inheritedId, confs));
} catch (Exception ex) {
Expand Down

0 comments on commit cfb15b1

Please sign in to comment.