comparison src/share/vm/runtime/arguments.cpp @ 6157:84e198dc2474

Merge
author asaha
date Mon, 21 May 2012 14:56:33 -0700
parents 958bb4b7be49 f3a4ee95783b
children f9d57285de70 fe4a4ea5bed9
comparison
equal deleted inserted replaced
6156:6d2c830e025d 6157:84e198dc2474
827 jio_fprintf(defaultStream::error_stream(), 827 jio_fprintf(defaultStream::error_stream(),
828 "Unrecognized VM option '%s'\n", argname); 828 "Unrecognized VM option '%s'\n", argname);
829 } else { 829 } else {
830 jio_fprintf(defaultStream::error_stream(), "%s", locked_message_buf); 830 jio_fprintf(defaultStream::error_stream(), "%s", locked_message_buf);
831 } 831 }
832 } else {
833 jio_fprintf(defaultStream::error_stream(),
834 "Unrecognized VM option '%s'\n", argname);
832 } 835 }
833 836
834 // allow for commandline "commenting out" options like -XX:#+Verbose 837 // allow for commandline "commenting out" options like -XX:#+Verbose
835 return arg[0] == '#'; 838 return arg[0] == '#';
836 } 839 }