stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8297455: Use the official ToolProvider API to call javac

Browse Source 
Reviewed-by: erikj
This commit is contained in:
Magnus Ihse Bursie 2022-12-02 00:08:34 +00:00
parent 257aa15f15
commit b035056d28
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
make/langtools/tools/javacserver/server/Server.java
View File

@ -25,7 +25,6 @@
package javacserver.server;
import com.sun.tools.javac.Main;
import java.io.BufferedReader;
import java.io.FileNotFoundException;
import java.io.IOException;
@ -39,8 +38,10 @@ import java.net.ServerSocket;
import java.net.Socket;
import java.net.SocketException;
import java.nio.file.Path;
import java.util.Optional;
import java.util.Random;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.spi.ToolProvider;
import javacserver.shared.PortFile;
import javacserver.shared.Protocol;
import javacserver.shared.Result;
@ -225,7 +226,6 @@ public class Server {
}
}
@SuppressWarnings("deprecated")
public static int runCompiler(Log log, String[] args) {
Log.setLogForCurrentThread(log);
@ -234,7 +234,12 @@ public class Server {
PrintWriter printWriter = new PrintWriter(strWriter);
// Compile
int exitcode = Main.compile(args, printWriter);
Optional<ToolProvider> tool = ToolProvider.findFirst("javac");
if (tool.isEmpty()) {
Log.error("Can't find tool javac");
return Result.ERROR.exitCode;
}
int exitcode = tool.get().run(printWriter, printWriter, args);
// Process compiler output (which is always errors)
printWriter.flush();