--- old/src/share/vm/runtime/arguments.hpp 2015-08-06 16:29:04.519377296 -0400 +++ new/src/share/vm/runtime/arguments.hpp 2015-08-06 16:29:04.387378946 -0400 @@ -423,9 +423,8 @@ // Returns true if the flag is obsolete and fits into the range specified // for being ignored. In the case the 'version' buffer is filled in with - // the version number when the flag became obsolete. Otherwise the flag has - // expired and should be ignored. - static bool is_newly_obsolete(const char* flag_name, JDK_Version* version); + // the version number when the flag became obsolete. + static bool is_obsolete_flag(const char* flag_name, JDK_Version* version); // Returns 1 if the flag is deprecated and jdk version is in the range specified. // In this case the 'version' buffer is filled in with the version number when @@ -434,10 +433,11 @@ // Returns 0 if the flag is not deprecated. static int is_deprecated_flag(const char* flag_name, JDK_Version* version); - // Return the real name for the flag passed on the command line. + // Return the real name for the flag passed on the command line (either an alias name or "flag_name"). static const char* real_flag_name(const char *flag_name); // Return the "real" name for option arg if arg is an alias, and print a warning if arg is deprecated. + // Return NULL if the arg has expired. static const char* handle_aliases_and_deprecation(const char* arg, bool warn); static short CompileOnlyClassesNum;