archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-17 09:34:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8180709: java -javaagent:agent.jar with run-time that does not contain java.instrument prints confusing error

Browse source 
Reviewed-by: cjplummer, sspitsyn
This commit is contained in:
Gary Adams 2017-12-20 13:41:40 -05:00
parent 808189636a
commit 257f4fccd0
3 changed files with 23 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/hotspot/share/runtime/thread.cpp
View file

@ -4038,9 +4038,16 @@ static OnLoadEntry_t lookup_on_load(AgentLibrary* agent,
}
if (library == NULL) {
const char *sub_msg = " on the library path, with error: ";
size_t len = strlen(msg) + strlen(name) + strlen(sub_msg) + strlen(ebuf) + 1;
const char *sub_msg2 = "\nModule java.instrument may be missing from runtime image.";
size_t len = strlen(msg) + strlen(name) + strlen(sub_msg) +
strlen(ebuf) + strlen(sub_msg2) + 1;
char *buf = NEW_C_HEAP_ARRAY(char, len, mtThread);
jio_snprintf(buf, len, "%s%s%s%s", msg, name, sub_msg, ebuf);
if (!agent->is_instrument_lib()) {
jio_snprintf(buf, len, "%s%s%s%s", msg, name, sub_msg, ebuf);
} else {
jio_snprintf(buf, len, "%s%s%s%s%s", msg, name, sub_msg, ebuf, sub_msg2);
}
// If we can't find the agent, exit.
vm_exit_during_initialization(buf, NULL);
FREE_C_HEAP_ARRAY(char, buf);