Skip to content

Commit b6ddd62

Browse files
fix #853 - repair classloader for spring
1 parent 9822859 commit b6ddd62

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

querydsl-tooling/querydsl-codegen-utils/src/main/java/com/querydsl/codegen/utils/JDKEvaluatorFactory.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,7 @@
1818
import java.io.IOException;
1919
import java.io.StringWriter;
2020
import java.io.Writer;
21-
import java.util.Arrays;
22-
import java.util.Collections;
23-
import java.util.List;
24-
import java.util.Map;
21+
import java.util.*;
2522
import javax.tools.JavaCompiler;
2623
import javax.tools.SimpleJavaFileObject;
2724
import javax.tools.StandardLocation;
@@ -50,7 +47,8 @@ public JDKEvaluatorFactory(ClassLoader parent, JavaCompiler compiler) {
5047
this.fileManager =
5148
new MemFileManager(parent, compiler.getStandardFileManager(null, null, null));
5249
this.compiler = compiler;
53-
this.classpath = SimpleCompiler.getClassPath(parent);
50+
this.classpath = Optional.of(SimpleCompiler.getClassPath(parent)).filter(s -> !s.isEmpty())
51+
.orElseGet(() -> SimpleCompiler.getClassPath(compiler.getClass().getClassLoader()));
5452
this.loader = fileManager.getClassLoader(StandardLocation.CLASS_OUTPUT);
5553
this.compilationOptions = Arrays.asList("-classpath", classpath, "-g:none");
5654
}

0 commit comments

Comments
 (0)