Merge remote-tracking branch 'origin/master' into main

lukaseder · lukaseder · commit 7c27785e5c82 · 2022-03-31T10:04:15.000+02:00
diff --git a/jOOR-java-6/src/main/java/org/joor/Compile.java b/jOOR-java-6/src/main/java/org/joor/Compile.java
@@ -270,6 +270,7 @@
 
 
 
+<<<<<<< HEAD
 
 
 
@@ -311,3 +312,5 @@
 
 
 
+=======
+>>>>>>> refs/remotes/origin/master
diff --git a/jOOR-java-8/src/main/java/org/joor/Compile.java b/jOOR-java-8/src/main/java/org/joor/Compile.java
@@ -67,6 +67,9 @@ static Class<?> compile(String className, String content, CompileOptions compile
         catch (ClassNotFoundException ignore) {
             JavaCompiler compiler = ToolProvider.getSystemJavaCompiler();
 
+            if (compiler == null)
+                throw new ReflectException("No compiler was provided by ToolProvider.getSystemJavaCompiler(). Make sure the jdk.compiler module is available.");
+
             try {
                 ClassFileManager fileManager = new ClassFileManager(compiler.getStandardFileManager(null, null, null));
 
diff --git a/jOOR/src/main/java/org/joor/Compile.java b/jOOR/src/main/java/org/joor/Compile.java
@@ -67,6 +67,9 @@ static Class<?> compile(String className, String content, CompileOptions compile
         catch (ClassNotFoundException ignore) {
             JavaCompiler compiler = ToolProvider.getSystemJavaCompiler();
 
+            if (compiler == null)
+                throw new ReflectException("No compiler was provided by ToolProvider.getSystemJavaCompiler(). Make sure the jdk.compiler module is available.");
+
             try {
                 ClassFileManager fileManager = new ClassFileManager(compiler.getStandardFileManager(null, null, null));
 

Original file line number	Diff line number	Diff line change
`@@ -270,6 +270,7 @@`
`270`	`270`
`271`	`271`
`272`	`272`
	`273`	`+<<<<<<< HEAD`
`273`	`274`
`274`	`275`
`275`	`276`
`@@ -311,3 +312,5 @@`
`311`	`312`
`312`	`313`
`313`	`314`
	`315`	`+=======`
	`316`	`+>>>>>>> refs/remotes/origin/master`