8165346: j.l.ClassLoader.getDefinedPackage(String) throws NPE
Reviewed-by: alanb, lancea, shade
This commit is contained in:
parent
4f08176bb5
commit
397525a2d4
jdk
src/java.base/share/classes/java/lang
test/java/lang/ClassLoader
@ -1922,9 +1922,14 @@ public abstract class ClassLoader {
|
||||
* @return The {@code Package} of the given name defined by this class loader,
|
||||
* or {@code null} if not found
|
||||
*
|
||||
* @throws NullPointerException
|
||||
* if {@code name} is {@code null}.
|
||||
*
|
||||
* @since 9
|
||||
*/
|
||||
public final Package getDefinedPackage(String name) {
|
||||
Objects.requireNonNull(name, "name cannot be null");
|
||||
|
||||
NamedPackage p = packages.get(name);
|
||||
if (p == null)
|
||||
return null;
|
||||
@ -1962,6 +1967,9 @@ public abstract class ClassLoader {
|
||||
* @return The {@code Package} corresponding to the given name defined by
|
||||
* this class loader or its ancestors, or {@code null} if not found.
|
||||
*
|
||||
* @throws NullPointerException
|
||||
* if {@code name} is {@code null}.
|
||||
*
|
||||
* @deprecated
|
||||
* If multiple class loaders delegate to each other and define classes
|
||||
* with the same package name, and one such loader relies on the lookup
|
||||
|
@ -317,6 +317,9 @@ public class Package extends NamedPackage implements java.lang.reflect.Annotated
|
||||
* @return The {@code Package} of the given name defined by the caller's
|
||||
* class loader or its ancestors, or {@code null} if not found.
|
||||
*
|
||||
* @throws NullPointerException
|
||||
* if {@code name} is {@code null}.
|
||||
*
|
||||
* @deprecated
|
||||
* If multiple class loaders delegate to each other and define classes
|
||||
* with the same package name, and one such loader relies on the lookup
|
||||
|
57
jdk/test/java/lang/ClassLoader/GetDefinedPackage.java
Normal file
57
jdk/test/java/lang/ClassLoader/GetDefinedPackage.java
Normal file
@ -0,0 +1,57 @@
|
||||
/*
|
||||
* Copyright (c) 2016, 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
|
||||
* under the terms of the GNU General Public License version 2 only, as
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
* version 2 for more details (a copy is included in the LICENSE file that
|
||||
* accompanied this code).
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License version
|
||||
* 2 along with this work; if not, write to the Free Software Foundation,
|
||||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*
|
||||
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
|
||||
* or visit www.oracle.com if you need additional information or have any
|
||||
* questions.
|
||||
*/
|
||||
|
||||
/*
|
||||
* @test
|
||||
* @bug 8165346
|
||||
* @summary Basic test for ClassLoader::getDefinedPackage
|
||||
*/
|
||||
|
||||
public class GetDefinedPackage {
|
||||
public static void main(String... args) {
|
||||
TestClassLoader loader = new TestClassLoader();
|
||||
Package pkg = loader.getDefinedPackage(TestClassLoader.PKG_NAME);
|
||||
if (pkg == null) {
|
||||
throw new RuntimeException("package foo not found");
|
||||
}
|
||||
|
||||
try {
|
||||
loader.getDefinedPackage(null);
|
||||
throw new RuntimeException("NullPointerException not thrown");
|
||||
} catch (NullPointerException e) {
|
||||
}
|
||||
}
|
||||
|
||||
static class TestClassLoader extends ClassLoader {
|
||||
public static final String PKG_NAME = "foo";
|
||||
|
||||
public TestClassLoader() {
|
||||
super();
|
||||
definePackage(PKG_NAME);
|
||||
}
|
||||
|
||||
public Package definePackage(String name) {
|
||||
return definePackage(name, null, null, null, null, null, null, null);
|
||||
}
|
||||
}
|
||||
}
|
Loading…
x
Reference in New Issue
Block a user