github/ghidra
1
1
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-01-08 21:47:59 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/GP-59_jpleasu_fix_scripting_for_jdk14'

Browse Source
This commit is contained in:
ghidra1
2020-08-03 16:48:45 -04:00
parent 1d73296e07 f095cb7a57
commit c1095fe938
1 changed files with 24 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/osgi/GhidraSourceBundle.java
View File

@@ -18,6 +18,8 @@ package ghidra.app.plugin.core.osgi;
import static java.util.stream.Collectors.*;
import java.io.*;
import java.net.URL;
import java.net.URLClassLoader;
import java.nio.charset.Charset;
import java.nio.file.*;
import java.util.*;
@@ -726,8 +728,8 @@ public class GhidraSourceBundle extends GhidraBundle {
final ResourceFileJavaFileManager resourceFileJavaManager = new ResourceFileJavaFileManager(
Collections.singletonList(getSourceDirectory()), buildErrors.keySet());
BundleJavaManager bundleJavaManager =
new BundleJavaManager(bundleHost.getHostFramework(), resourceFileJavaManager, options);
BundleJavaManager bundleJavaManager = new MyBundleJavaManager(bundleHost.getHostFramework(),
resourceFileJavaManager, options);
// The phidias BundleJavaManager is for compiling from within a bundle -- it makes the
// bundle dependencies available to the compiler classpath. Here, we are compiling in an as-yet
@@ -937,7 +939,7 @@ public class GhidraSourceBundle extends GhidraBundle {
try (StandardJavaFileManager javaFileManager =
compiler.getStandardFileManager(null, null, null);
BundleJavaManager bundleJavaManager = new BundleJavaManager(
BundleJavaManager bundleJavaManager = new MyBundleJavaManager(
bundleHost.getHostFramework(), javaFileManager, options);) {
Iterable<? extends JavaFileObject> sourceFiles =
javaFileManager.getJavaFileObjectsFromPaths(List.of(activatorSourceFileName));
@@ -1025,6 +1027,25 @@ public class GhidraSourceBundle extends GhidraBundle {
}
}
private static class MyBundleJavaManager extends BundleJavaManager {
static URL[] EMPTY_URL_ARRAY = new URL[0];
MyBundleJavaManager(Bundle bundle, JavaFileManager javaFileManager, List<String> options)
throws IOException {
super(bundle, javaFileManager, options);
}
/**
* since the JavaCompiler tasks can close the class loader returned by this
* method, make sure we're returning a copy.
*/
@Override
public ClassLoader getClassLoader() {
return new URLClassLoader(EMPTY_URL_ARRAY, super.getClassLoader());
}
}
private static class Summary {
static String SEPERATOR = ", ";
final StringWriter stringWriter = new StringWriter();