aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarald Musum <musum@yahooinc.com>2022-08-12 09:37:20 +0200
committerHarald Musum <musum@yahooinc.com>2022-08-12 09:37:20 +0200
commit97b35e196c75932d72ff1db83faedeed6bb67db3 (patch)
treeb4bd4cd1a44ca3ada2208bcf0257848e31f409b3
parent8894aaf15570b0b1b7cf5f181499d592024d3a57 (diff)
Extract method
-rw-r--r--configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionRepository.java8
1 files changed, 6 insertions, 2 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionRepository.java b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionRepository.java
index 8b0da901b38..a6bbd6c20a2 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionRepository.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionRepository.java
@@ -686,6 +686,12 @@ public class SessionRepository {
DeployData deployData = new DeployData(userDir.getAbsolutePath(), applicationId, deployTimestamp, internalRedeploy,
sessionId, currentlyActiveSessionId.orElse(nonExistingActiveSessionId));
FilesApplicationPackage app = FilesApplicationPackage.fromFileWithDeployData(configApplicationDir, deployData);
+ validateFileExtensions(applicationId, deployLogger, app);
+
+ return app;
+ }
+
+ private void validateFileExtensions(ApplicationId applicationId, Optional<DeployLogger> deployLogger, FilesApplicationPackage app) {
try {
app.validateFileExtensions();
} catch (IllegalArgumentException e) {
@@ -701,8 +707,6 @@ public class SessionRepository {
deployLogger.ifPresent(logger -> logger.logApplicationPackage(Level.WARNING, e.getMessage()));
}
}
-
- return app;
}
private LocalSession createSessionFromApplication(File applicationDirectory,