src/share/vm/runtime/arguments.cpp

*** 3365,3376 ****
    // Don't check this variable if user has special privileges
    // (e.g. unix su command).
    if (os::getenv(name, buffer, sizeof(buffer)) &&
        !os::have_special_privileges()) {
      JavaVMOption options[N_MAX_OPTIONS];      // Construct option array
!     jio_fprintf(defaultStream::error_stream(),
!                 "Picked up %s: %s\n", name, buffer);
      char* rd = buffer;                        // pointer to the input string (rd)
      int i;
      for (i = 0; i < N_MAX_OPTIONS;) {         // repeat for all options in the input string
        while (isspace(*rd)) rd++;              // skip whitespace
        if (*rd == 0) break;                    // we re done when the input string is read completely
--- 3365,3381 ----
    // Don't check this variable if user has special privileges
    // (e.g. unix su command).
    if (os::getenv(name, buffer, sizeof(buffer)) &&
        !os::have_special_privileges()) {
      JavaVMOption options[N_MAX_OPTIONS];      // Construct option array
! 
!     bool suppress_message = false;            // the message will be printed unless requested not to
!     char message[OPTION_BUFFER_SIZE + 256];   // enough space for the options, message and the variable name
!     jio_snprintf(message, sizeof(message),    // message with the unmodidied yet buffer
!                  "Picked up %s: %s\n",
!                  name, buffer);
! 
      char* rd = buffer;                        // pointer to the input string (rd)
      int i;
      for (i = 0; i < N_MAX_OPTIONS;) {         // repeat for all options in the input string
        while (isspace(*rd)) rd++;              // skip whitespace
        if (*rd == 0) break;                    // we re done when the input string is read completely
*** 3378,3396 ****
        // The output, option string, overwrites the input string.
        // Because of quoting, the pointer to the option string (wrt) may lag the pointer to
        // input string (rd).
        char* wrt = rd;
  
!       options[i++].optionString = wrt;        // Fill in option
        while (*rd != 0 && !isspace(*rd)) {     // unquoted strings terminate with a space or NULL
          if (*rd == '\'' || *rd == '"') {      // handle a quoted string
            int quote = *rd;                    // matching quote to look for
            rd++;                               // don't copy open quote
            while (*rd != quote) {              // include everything (even spaces) up until quote
              if (*rd == 0) {                   // string termination means unmatched string
                jio_fprintf(defaultStream::error_stream(),
!                           "Unmatched quote in %s\n", name);
                return JNI_ERR;
              }
              *wrt++ = *rd++;                   // copy to option string
            }
            rd++;                               // don't copy close quote
--- 3383,3414 ----
        // The output, option string, overwrites the input string.
        // Because of quoting, the pointer to the option string (wrt) may lag the pointer to
        // input string (rd).
        char* wrt = rd;
  
!       options[i].optionString = wrt;          // Fill in option
! 
!       // Check if we're requested to suppress the message about picking up options
!       const char* tail;
!       if (match_option(&options[i], "-XX:+SuppressJavaOptsOutput", &tail) &&
!           (*tail == 0 || isspace(*tail))) {
!         suppress_message = true;
!         // remove the -XX:+SuppressJavaOptsOutput option from further processing
!         rd += tail - rd;
!         continue;
!       }
! 
!       i++;
        while (*rd != 0 && !isspace(*rd)) {     // unquoted strings terminate with a space or NULL
          if (*rd == '\'' || *rd == '"') {      // handle a quoted string
            int quote = *rd;                    // matching quote to look for
            rd++;                               // don't copy open quote
            while (*rd != quote) {              // include everything (even spaces) up until quote
              if (*rd == 0) {                   // string termination means unmatched string
                jio_fprintf(defaultStream::error_stream(),
!                           "%sUnmatched quote in %s\n",
!                           suppress_message ? "" : message, name);
                return JNI_ERR;
              }
              *wrt++ = *rd++;                   // copy to option string
            }
            rd++;                               // don't copy close quote
*** 3404,3413 ****
--- 3422,3434 ----
          *wrt = 0;
          break;
        }
        *wrt = 0;                               // Zero terminate option
      }
+     if (!suppress_message) {
+       jio_fprintf(defaultStream::error_stream(), "%s", message);
+     }
      // Construct JavaVMInitArgs structure and parse as if it was part of the command line
      JavaVMInitArgs vm_args;
      vm_args.version = JNI_VERSION_1_2;
      vm_args.options = options;
      vm_args.nOptions = i;