comparison src/share/vm/memory/filemap.cpp @ 14422:2b8e28fdf503

Merge
author kvn
date Tue, 05 Nov 2013 17:38:04 -0800
parents 35b99e7e0af2
children ff056d90e349 78bbf4d43a14
comparison
equal deleted inserted replaced
14421:3068270ba476 14422:2b8e28fdf503
53 jio_fprintf(defaultStream::error_stream(), 53 jio_fprintf(defaultStream::error_stream(),
54 "An error has occurred while processing the" 54 "An error has occurred while processing the"
55 " shared archive file.\n"); 55 " shared archive file.\n");
56 jio_vfprintf(defaultStream::error_stream(), msg, ap); 56 jio_vfprintf(defaultStream::error_stream(), msg, ap);
57 jio_fprintf(defaultStream::error_stream(), "\n"); 57 jio_fprintf(defaultStream::error_stream(), "\n");
58 // Do not change the text of the below message because some tests check for it.
58 vm_exit_during_initialization("Unable to use shared archive.", NULL); 59 vm_exit_during_initialization("Unable to use shared archive.", NULL);
59 } 60 }
60 61
61 62
62 void FileMapInfo::fail_stop(const char *msg, ...) { 63 void FileMapInfo::fail_stop(const char *msg, ...) {