Skip to content

Commit f006085

Browse files
committed
Use binaryName consistently to refer to dot-separated class name
1 parent 1c0893d commit f006085

1 file changed

Lines changed: 7 additions & 7 deletions

File tree

src/main/java/io/smallrye/modules/ModuleClassLoader.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -206,15 +206,15 @@ protected final Class<?> loadClass(final String name, final boolean resolve) thr
206206
if (name.startsWith("[")) {
207207
return loadClassFromDescriptor(name, 0);
208208
}
209-
String dotName = name.replace('/', '.');
210-
String packageName = Util.packageName(dotName);
209+
String binaryName = name.replace('/', '.');
210+
String packageName = Util.packageName(binaryName);
211211
if (packageName.isEmpty() || linkNew().packages().containsKey(packageName)) {
212212
// force full linkage
213213
linkPackages();
214214
return loadClassDirect(name);
215215
}
216216
if (bootModuleIndex.containsKey(packageName)) {
217-
if (dotName.equals("java.util.ServiceLoader")) {
217+
if (binaryName.equals("java.util.ServiceLoader")) {
218218
// loading services! extra linking required
219219
linkUses();
220220
}
@@ -224,7 +224,7 @@ protected final Class<?> loadClass(final String name, final boolean resolve) thr
224224
throw new ClassNotFoundException("Cannot load " + name + ": package " + packageName + " not exported from "
225225
+ module + " to " + module());
226226
}
227-
Class<?> result = Class.forName(module, dotName);
227+
Class<?> result = Class.forName(module, binaryName);
228228
if (result != null) {
229229
return result;
230230
}
@@ -238,14 +238,14 @@ protected final Class<?> loadClass(final String name, final boolean resolve) thr
238238
Class<?> loaded;
239239
ClassLoader cl = lm.classLoader();
240240
if (cl == this) {
241-
loaded = loadClassDirect(dotName);
241+
loaded = loadClassDirect(binaryName);
242242
} else {
243243
Module module = module();
244244
if (lm.module().isExported(packageName, module)) {
245245
if (cl instanceof ModuleClassLoader mcl) {
246-
loaded = mcl.loadClassDirect(dotName);
246+
loaded = mcl.loadClassDirect(binaryName);
247247
} else {
248-
loaded = Class.forName(dotName, false, cl);
248+
loaded = Class.forName(binaryName, false, cl);
249249
}
250250
} else {
251251
throw new ClassNotFoundException(lm.name().map(n -> "Module " + n).orElse("Unnamed module")

0 commit comments

Comments
 (0)