[Git][java-team/openjdk-11-jre-dcevm][upstream] New upstream version 11.0.1+8
Emmanuel Bourg
gitlab at salsa.debian.org
Mon Feb 25 07:25:19 GMT 2019
Emmanuel Bourg pushed to branch upstream at Debian Java Maintainers / openjdk-11-jre-dcevm
Commits:
5007f6d8 by Emmanuel Bourg at 2019-02-25T06:53:41Z
New upstream version 11.0.1+8
- - - - -
2 changed files:
- src/hotspot/share/classfile/javaClasses.cpp
- src/hotspot/share/runtime/arguments.cpp
Changes:
=====================================
src/hotspot/share/classfile/javaClasses.cpp
=====================================
@@ -4193,12 +4193,14 @@ const char* java_lang_ClassLoader::describe_external(const oop loader) {
if (!well_known_loader) {
oop pl = java_lang_ClassLoader::parent(loader);
ClassLoaderData *pl_cld = ClassLoaderData::class_loader_data(pl);
- const char* parentName = pl_cld->loader_name_and_id();
- if (pl != NULL) {
- ss.print(", child of %s %s", parentName, pl->klass()->external_name());
- } else {
- // bootstrap loader
- ss.print(", child of %s", parentName);
+ if (pl_cld != NULL) {
+ const char* parentName = pl_cld->loader_name_and_id();
+ if (pl != NULL) {
+ ss.print(", child of %s %s", parentName, pl->klass()->external_name());
+ } else {
+ // bootstrap loader
+ ss.print(", child of %s", parentName);
+ }
}
}
ss.print(")");
=====================================
src/hotspot/share/runtime/arguments.cpp
=====================================
@@ -4247,6 +4247,9 @@ bool Arguments::copy_expand_pid(const char* src, size_t srclen,
void Arguments::setup_hotswap_agent() {
+ if (DumpSharedSpaces)
+ return;
+
if (!AllowEnhancedClassRedefinition)
return;
View it on GitLab: https://salsa.debian.org/java-team/openjdk-11-jre-dcevm/commit/5007f6d8a63602962877602725384d027205c82f
--
View it on GitLab: https://salsa.debian.org/java-team/openjdk-11-jre-dcevm/commit/5007f6d8a63602962877602725384d027205c82f
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20190225/e8ef62d4/attachment.html>
More information about the pkg-java-commits
mailing list