aboutsummaryrefslogtreecommitdiffstats
path: root/configserver
diff options
context:
space:
mode:
authorJon Marius Venstad <jonmv@users.noreply.github.com>2024-01-05 08:05:47 +0100
committerGitHub <noreply@github.com>2024-01-05 08:05:47 +0100
commitd02469096d4bf5b0bc742e5ec978f9f8cc873eda (patch)
treede5613532bfd2ed52586d3072d6b0b891a91d66f /configserver
parentd8b50e4eaea708fed984c7c6ccdd06ac48b358bf (diff)
Revert "Revert "Jonmv/refactor validation" MERGEOK"
Diffstat (limited to 'configserver')
-rw-r--r--configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionPreparer.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionPreparer.java b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionPreparer.java
index 90087a25c59..5c049c61c1a 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionPreparer.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionPreparer.java
@@ -293,7 +293,8 @@ public class SessionPreparer {
(path, attr) -> attr.isRegularFile() && path.getFileName().toString().matches(".*\\.[Jj][Aa][Rr]"))) {
paths.forEach(jarPath -> {
try {
- new BundleValidator().getPomXmlContent(logger, new JarFile(jarPath.toFile())).ifPresent(pom -> {
+ new BundleValidator().getPomXmlContent((msg, cause) -> { throw new IllegalArgumentException(msg, cause); },
+ logger, new JarFile(jarPath.toFile())).ifPresent(pom -> {
try {
new ValidationProcessor().process(pom);
}