Skip to content

Commit 25dca90

Browse files
fix: renaming
1 parent 34053f5 commit 25dca90

2 files changed

Lines changed: 7 additions & 5 deletions

File tree

dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/compiler/CompilerModuleExporter.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,9 @@ public byte[] transform(
5454
&& className.startsWith(COMPILER_PLUGIN_CLASS_PREFIX)
5555
&& exportedClassLoaders.add(loader)) {
5656
try {
57-
JDK9ModuleAccess.addModuleExports(inst, "jdk.compiler", COMPILER_PACKAGES, loader);
58-
LOGGER.debug("Exported jdk.compiler packages to classloader {}", loader);
57+
JDK9ModuleAccess.exportModuleToUnnamedModule(
58+
inst, "jdk.compiler", COMPILER_PACKAGES, loader);
59+
LOGGER.debug("Exported jdk.compiler to classloader {}", loader);
5960
} catch (Throwable e) {
6061
LOGGER.debug("Could not export jdk.compiler packages for compiler plugin", e);
6162
}

internal-api/internal-api-9/src/main/java/datadog/trace/util/JDK9ModuleAccess.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@ public static void addModuleReads(
3737
emptyMap());
3838
}
3939

40-
/** Exports packages from a named module to a classloader's unnamed module. */
40+
/** Exports specific packages of a named module to a classloader's unnamed module. */
4141
@SuppressWarnings({"rawtypes", "unchecked"})
42-
public static void addModuleExports(
42+
public static void exportModuleToUnnamedModule(
4343
Instrumentation inst,
4444
String moduleName,
4545
String[] packageNames,
@@ -51,9 +51,10 @@ public static void addModuleExports(
5151
Module module = optModule.get();
5252
Module unnamedModule = targetClassLoader.getUnnamedModule();
5353

54+
Set<Module> target = Collections.singleton(unnamedModule);
5455
Map<String, Set<Module>> extraExports = new HashMap<>();
5556
for (String packageName : packageNames) {
56-
extraExports.put(packageName, Collections.singleton(unnamedModule));
57+
extraExports.put(packageName, target);
5758
}
5859

5960
inst.redefineModule(

0 commit comments

Comments
 (0)