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

8211825: ModuleLayer.defineModulesWithXXX does not setup delegation when module reads automatic module

Browse source 
Reviewed-by: mchung
This commit is contained in:
Alan Bateman 2018-10-09 07:06:32 +01:00
parent 61f453edf7
commit cb3fe46b95
7 changed files with 283 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/java.base/share/classes/java/lang/Module.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -477,7 +477,7 @@ public final class Module implements AnnotatedElement {
*
* @see ModuleDescriptor#opens()
* @see #addOpens(String,Module)
* @see AccessibleObject#setAccessible(boolean)
* @see java.lang.reflect.AccessibleObject#setAccessible(boolean)
* @see java.lang.invoke.MethodHandles#privateLookupIn
*/
public boolean isOpen(String pn, Module other) {
@ -747,7 +747,7 @@ public final class Module implements AnnotatedElement {
* package to at least the caller's module
*
* @see #isOpen(String,Module)
* @see AccessibleObject#setAccessible(boolean)
* @see java.lang.reflect.AccessibleObject#setAccessible(boolean)
* @see java.lang.invoke.MethodHandles#privateLookupIn
*/
@CallerSensitive
@ -1061,7 +1061,10 @@ public final class Module implements AnnotatedElement {
* @return a map of module name to runtime {@code Module}
*
* @throws IllegalArgumentException
* If defining any of the modules to the VM fails
* If the function maps a module to the null or platform class loader
* @throws IllegalStateException
* If the module cannot be defined to the VM or its packages overlap
* with another module mapped to the same class loader
*/
static Map<String, Module> defineModules(Configuration cf,
Function<String, ClassLoader> clf,