diff options
| author | jonmv <venstad@gmail.com> | 2022-04-19 14:57:19 +0200 |
|---|---|---|
| committer | jonmv <venstad@gmail.com> | 2022-04-19 14:57:19 +0200 |
| commit | cc4927b16a3923429de7a87c151576e8313d1ee8 (patch) | |
| tree | 25d195ed7eefb1fa44b922ea1f5f24e5cf342f1b /config-application-package | |
| parent | 7da4782d0724a68febcba242e60745d129a378a4 (diff) | |
Stricter application id pattern
Diffstat (limited to 'config-application-package')
| -rw-r--r-- | config-application-package/src/main/java/com/yahoo/config/model/application/provider/FilesApplicationPackage.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/config-application-package/src/main/java/com/yahoo/config/model/application/provider/FilesApplicationPackage.java b/config-application-package/src/main/java/com/yahoo/config/model/application/provider/FilesApplicationPackage.java index 36ebb621475..0579aebe771 100644 --- a/config-application-package/src/main/java/com/yahoo/config/model/application/provider/FilesApplicationPackage.java +++ b/config-application-package/src/main/java/com/yahoo/config/model/application/provider/FilesApplicationPackage.java @@ -481,12 +481,13 @@ public class FilesApplicationPackage extends AbstractApplicationPackage { } private static ApplicationMetaData readMetaData(File appDir) { + String originalAppDir = preprocessed.equals(appDir.getName()) ? appDir.getParentFile().getName() : appDir.getName(); ApplicationMetaData defaultMetaData = new ApplicationMetaData("n/a", "n/a", 0L, false, ApplicationId.from(TenantName.defaultName(), - ApplicationName.from(appDir.getName()), + ApplicationName.from(originalAppDir), InstanceName.defaultName()), "", 0L, |