archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-26 22:34:27 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8200125: Fix some classloader/module typos

Browse source 
Reviewed-by: alanb
This commit is contained in:
Martin Buchholz 2018-04-05 09:33:27 -07:00
parent 97d7cfb14e
commit 184bbf01dd
8 changed files with 28 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/java.base/share/classes/java/lang/ClassLoader.java
View file

@ -699,7 +699,7 @@ public abstract class ClassLoader {
/**
* Finds the class with the given <a href="#binary-name">binary name</a>
* in a module defined to this class loader.
* Class loader implementations that support the loading from modules
* Class loader implementations that support loading from modules
* should override this method.
*
* @apiNote This method returns {@code null} rather than throwing
@ -1281,7 +1281,7 @@ public abstract class ClassLoader {
/**
* Returns a URL to a resource in a module defined to this class loader.
* Class loader implementations that support the loading from modules
* Class loader implementations that support loading from modules
* should override this method.
*
* @apiNote This method is the basis for the {@link
@ -1417,12 +1417,12 @@ public abstract class ClassLoader {
* @param name
* The resource name
*
* @return An enumeration of {@link java.net.URL URL} objects for
* the resource. If no resources could be found, the enumeration
* will be empty. Resources for which a {@code URL} cannot be
* constructed, are in package that is not opened unconditionally,
* or access to the resource is denied by the security manager,
* are not returned in the enumeration.
* @return An enumeration of {@link java.net.URL URL} objects for the
* resource. If no resources could be found, the enumeration will
* be empty. Resources for which a {@code URL} cannot be
* constructed, are in a package that is not opened
* unconditionally, or access to the resource is denied by the
* security manager, are not returned in the enumeration.
*
* @throws IOException
* If I/O errors occur

4
src/java.base/share/classes/java/lang/ModuleLayer.java
View file

@ -152,7 +152,7 @@ public final class ModuleLayer {
private static final ModuleLayer EMPTY_LAYER
= new ModuleLayer(Configuration.empty(), List.of(), null);
// the configuration from which this ;ayer was created
// the configuration from which this layer was created
private final Configuration cf;
// parent layers, empty in the case of the empty layer
@ -498,7 +498,7 @@ public final class ModuleLayer {
try {
Loader loader = new Loader(cf.modules(), parentLoader);
loader.initRemotePackageMap(cf, parents);
ModuleLayer layer = new ModuleLayer(cf, parents, mn -> loader);
ModuleLayer layer = new ModuleLayer(cf, parents, mn -> loader);
return new Controller(layer);
} catch (IllegalArgumentException | IllegalStateException e) {
throw new LayerInstantiationException(e.getMessage());

2
src/java.base/share/classes/java/net/URL.java
View file

@ -1411,7 +1411,7 @@ public final class URL implements java.io.Serializable {
// Check with factory if another thread set a
// factory since our last check
if (!checkedWithFactory && (fac = factory) != null) {
handler2 = fac.createURLStreamHandler(protocol);
handler2 = fac.createURLStreamHandler(protocol);
}
if (handler2 != null) {

2
src/java.base/share/classes/java/net/URLClassLoader.java
View file

@ -764,7 +764,7 @@ public class URLClassLoader extends SecureClassLoader implements Closeable {
path = ParseUtil.decode(path);
if (path.endsWith(File.separator))
path += "-";
p = new FilePermission(path, SecurityConstants.FILE_READ_ACTION);
p = new FilePermission(path, SecurityConstants.FILE_READ_ACTION);
} else {
/**
* Not loading from a 'file:' URL so we want to give the class