Set the validator class loader during its execution

fedora-java · Nov 6, 2023 · b635485 · b635485
1 parent f10f2d4
commit b635485
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/src/main/java/org/fedoraproject/javapackages/validator/Main.java b/src/main/java/org/fedoraproject/javapackages/validator/Main.java
@@ -456,8 +456,10 @@ List<NamedResult> execute(Collection<Validator> validators) throws Exception {
             }
         });
         Iterators.addAll(rpms, new ArgFileIterator(parameters.argPaths));
+        var oldClassLoader = Thread.currentThread().getContextClassLoader();
         return validators.parallelStream().map(validator -> {
             try {
+                Thread.currentThread().setContextClassLoader(validator.getClass().getClassLoader());
                 var startTime = LocalDateTime.now();
                 var result = validator.validate(rpms, parameters.validatorArgs
                         .getOrDefault(validator.getTestName(), Optional.empty()).orElse(null));
@@ -468,6 +470,8 @@ List<NamedResult> execute(Collection<Validator> validators) throws Exception {
                 var logEntry = Common.logException(ex);
                 result.error(logEntry.pattern(), logEntry.objects());
                 return new NamedResult(result, validator.getTestName());
+            } finally {
+                Thread.currentThread().setContextClassLoader(oldClassLoader);
             }
         }).toList();
     }