archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-28 07:14:30 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge

Browse source
This commit is contained in:
Alejandro Murillo 2014-12-05 16:36:07 -08:00
commit db929c3598
197 changed files with 3543 additions and 1963 deletions
Download patch file Download diff file Expand all files Collapse all files

4
hotspot/src/share/vm/memory/filemap.cpp
View file

@ -331,7 +331,7 @@ bool FileMapInfo::init_from_file(int fd) {
n = os::read(fd, _paths_misc_info, (unsigned int)info_size);
if (n != info_size) {
fail_continue("Unable to read the shared path info header.");
FREE_C_HEAP_ARRAY(char, _paths_misc_info, mtClass);
FREE_C_HEAP_ARRAY(char, _paths_misc_info);
_paths_misc_info = NULL;
return false;
}
@ -714,7 +714,7 @@ bool FileMapInfo::validate_header() {
}
if (_paths_misc_info != NULL) {
FREE_C_HEAP_ARRAY(char, _paths_misc_info, mtClass);
FREE_C_HEAP_ARRAY(char, _paths_misc_info);
_paths_misc_info = NULL;
}
return status;