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

8233091: Backout JDK-8212117: Class.forName loads a class but not linked if class is not initialized

Browse source 
Reviewed-by: alanb, dholmes, mchung
This commit is contained in:
Brent Christian 2019-11-04 11:42:24 -08:00
parent 691e75e223
commit 3561b4ed50
13 changed files with 14 additions and 340 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/java.base/share/classes/sun/launcher/LauncherHelper.java
View file

@ -62,7 +62,6 @@ import java.nio.charset.Charset;
import java.nio.file.DirectoryStream;
import java.nio.file.Files;
import java.nio.file.Path;
import java.security.AccessControlException;
import java.text.Normalizer;
import java.text.MessageFormat;
import java.util.ArrayList;
@ -725,9 +724,6 @@ public final class LauncherHelper {
} catch (LinkageError le) {
abort(null, "java.launcher.module.error3", mainClass, m.getName(),
le.getClass().getName() + ": " + le.getLocalizedMessage());
} catch (AccessControlException ace) {
abort(ace, "java.launcher.module.error5", mainClass, m.getName(),
ace.getClass().getName(), ace.getLocalizedMessage());
}
if (c == null) {
abort(null, "java.launcher.module.error2", mainClass, mainModule);
@ -784,9 +780,6 @@ public final class LauncherHelper {
} catch (LinkageError le) {
abort(le, "java.launcher.cls.error6", cn,
le.getClass().getName() + ": " + le.getLocalizedMessage());
} catch (AccessControlException ace) {
abort(ace, "java.launcher.cls.error7", cn,
ace.getClass().getName(), ace.getLocalizedMessage());
}
return mainClass;
}