hotspot/src/share/vm/runtime/java.cpp

*** 649,691 ****
      // Incompatible with pre-4243978 JDK.
      if (info.pending_list_uses_discovered_field == 0) {
        vm_exit_during_initialization(
          "Incompatible JDK is not using Reference.discovered field for pending list");
      }
!     _current = JDK_Version(major, minor, security, info.update_version,
!                            info.special_update_version, build,
                             info.thread_park_blocker == 1,
                             info.post_vm_init_hook_enabled == 1);
    }
  }
  
- void JDK_Version::fully_initialize(
-     uint8_t major, uint8_t minor, uint8_t security, uint8_t update) {
-   // This is only called when current is less than 1.6 and we've gotten
-   // far enough in the initialization to determine the exact version.
-   assert(major < 6, "not needed for JDK version >= 6");
-   assert(is_partially_initialized(), "must not initialize");
-   if (major < 5) {
-     // JDK verison sequence: 1.2.x, 1.3.x, 1.4.x, 5.0.x, 6.0.x, etc.
-     security = minor;
-     minor = major;
-     major = 1;
-   }
-   _current = JDK_Version(major, minor, security, update);
- }
- 
  void JDK_Version_init() {
    JDK_Version::initialize();
  }
  
  static int64_t encode_jdk_version(const JDK_Version& v) {
    return
!     ((int64_t)v.major_version()          << (BitsPerByte * 5)) |
!     ((int64_t)v.minor_version()          << (BitsPerByte * 4)) |
!     ((int64_t)v.security_version()       << (BitsPerByte * 3)) |
!     ((int64_t)v.update_version()         << (BitsPerByte * 2)) |
!     ((int64_t)v.special_update_version() << (BitsPerByte * 1)) |
      ((int64_t)v.build_number()           << (BitsPerByte * 0));
  }
  
  int JDK_Version::compare(const JDK_Version& other) const {
    assert(is_valid() && other.is_valid(), "Invalid version (uninitialized?)");
--- 649,674 ----
      // Incompatible with pre-4243978 JDK.
      if (info.pending_list_uses_discovered_field == 0) {
        vm_exit_during_initialization(
          "Incompatible JDK is not using Reference.discovered field for pending list");
      }
!     _current = JDK_Version(major, minor, security, info.patch_version, build,
                             info.thread_park_blocker == 1,
                             info.post_vm_init_hook_enabled == 1);
    }
  }
  
  void JDK_Version_init() {
    JDK_Version::initialize();
  }
  
  static int64_t encode_jdk_version(const JDK_Version& v) {
    return
!     ((int64_t)v.major_version()          << (BitsPerByte * 4)) |
!     ((int64_t)v.minor_version()          << (BitsPerByte * 3)) |
!     ((int64_t)v.security_version()       << (BitsPerByte * 2)) |
!     ((int64_t)v.patch_version()          << (BitsPerByte * 1)) |
      ((int64_t)v.build_number()           << (BitsPerByte * 0));
  }
  
  int JDK_Version::compare(const JDK_Version& other) const {
    assert(is_valid() && other.is_valid(), "Invalid version (uninitialized?)");
*** 718,739 ****
      if (rc == -1) return;
      index += rc;
      if (_security > 0) {
        rc = jio_snprintf(&buffer[index], buflen - index, ".%d", _security);
      }
!     if (_update > 0) {
!       rc = jio_snprintf(&buffer[index], buflen - index, "_%02d", _update);
!       if (rc == -1) return;
!       index += rc;
!     }
!     if (_special > 0) {
!       rc = jio_snprintf(&buffer[index], buflen - index, "%c", _special);
        if (rc == -1) return;
        index += rc;
      }
      if (_build > 0) {
!       rc = jio_snprintf(&buffer[index], buflen - index, "-b%02d", _build);
        if (rc == -1) return;
        index += rc;
      }
    }
  }
--- 701,717 ----
      if (rc == -1) return;
      index += rc;
      if (_security > 0) {
        rc = jio_snprintf(&buffer[index], buflen - index, ".%d", _security);
      }
!     if (_patch > 0) {
!       rc = jio_snprintf(&buffer[index], buflen - index, ".%d", _patch);
        if (rc == -1) return;
        index += rc;
      }
      if (_build > 0) {
!       rc = jio_snprintf(&buffer[index], buflen - index, "+%d", _build);
        if (rc == -1) return;
        index += rc;
      }
    }
  }