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

Merge

Browse source
This commit is contained in:
Keith McGuigan 2008-03-20 09:17:30 -05:00
commit c2c3f0fe72
21 changed files with 106 additions and 210 deletions
Download patch file Download diff file Expand all files Collapse all files

6
hotspot/src/share/vm/runtime/sharedRuntime.cpp
View file

@ -1486,11 +1486,9 @@ char* SharedRuntime::generate_class_cast_message(
const char* desc = " cannot be cast to ";
size_t msglen = strlen(objName) + strlen(desc) + strlen(targetKlassName) + 1;
char* message = NEW_C_HEAP_ARRAY(char, msglen);
char* message = NEW_RESOURCE_ARRAY(char, msglen);
if (NULL == message) {
// out of memory - can't use a detailed message. Since caller is
// using a resource mark to free memory, returning this should be
// safe (caller won't explicitly delete it).
// Shouldn't happen, but don't cause even more problems if it does
message = const_cast<char*>(objName);
} else {
jio_snprintf(message, msglen, "%s%s%s", objName, desc, targetKlassName);