infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-05-17 17:07:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

8165881: Backout JDK-8164913

Browse Source 
Reviewed-by: hseigel
This commit is contained in:
Christian Tornqvist 2016-09-12 13:16:39 -04:00
parent f6a7898995
commit 22d512c0ed
2 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hotspot/src/share/vm/prims/jvmtiExport.cpp
View File

@ -2407,7 +2407,9 @@ jint JvmtiExport::load_agent_library(const char *agent, const char *absParam,
delete agent_lib;
}
// Agent_OnAttach executed so completion status is JNI_OK
st->print_cr("%d", result);
result = JNI_OK;
}
}
return result;

15
hotspot/src/share/vm/services/diagnosticCommand.cpp
View File

@ -277,12 +277,11 @@ void JVMTIAgentLoadDCmd::execute(DCmdSource source, TRAPS) {
char *suffix = strrchr(_libpath.value(), '.');
bool is_java_agent = (suffix != NULL) && (strncmp(".jar", suffix, 4) == 0);
jint result = JNI_ERR;
if (is_java_agent) {
if (_option.value() == NULL) {
result = JvmtiExport::load_agent_library("instrument", "false",
_libpath.value(), output());
JvmtiExport::load_agent_library("instrument", "false",
_libpath.value(), output());
} else {
size_t opt_len = strlen(_libpath.value()) + strlen(_option.value()) + 2;
if (opt_len > 4096) {
@ -299,18 +298,14 @@ void JVMTIAgentLoadDCmd::execute(DCmdSource source, TRAPS) {
}
jio_snprintf(opt, opt_len, "%s=%s", _libpath.value(), _option.value());
result = JvmtiExport::load_agent_library("instrument", "false",
opt, output());
JvmtiExport::load_agent_library("instrument", "false", opt, output());
os::free(opt);
}
} else {
result = JvmtiExport::load_agent_library(_libpath.value(), "true",
_option.value(), output());
JvmtiExport::load_agent_library(_libpath.value(), "true",
_option.value(), output());
}
output()->print_cr("JVMTI agent attach %s.",
(result == JNI_OK) ? "succeeded" : "failed");
}
int JVMTIAgentLoadDCmd::num_arguments() {