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

@@ -80,12 +80,11 @@
   // drop the leading 1 and use 5 as the 'major').
 
   uint8_t _major;
   uint8_t _minor;
   uint8_t _security;
-  uint8_t _update;
-  uint8_t _special;
+  uint8_t _patch;
   uint8_t _build;
 
   // If partially initialized, the above fields are invalid and we know
   // that we're less than major version 6.
   bool _partially_initialized;

@@ -98,31 +97,27 @@
   }
 
   // initializes or partially initializes the _current static field
   static void initialize();
 
-  // Completes initialization for a pre-JDK6 version.
-  static void fully_initialize(uint8_t major, uint8_t minor = 0,
-                               uint8_t security = 0, uint8_t update = 0);
-
  public:
 
   // Returns true if the the current version has only been partially initialized
   static bool is_partially_initialized() {
     return _current._partially_initialized;
   }
 
-  JDK_Version() : _major(0), _minor(0), _security(0), _update(0),
-                  _special(0), _build(0), _partially_initialized(false),
+  JDK_Version() : _major(0), _minor(0), _security(0), _patch(0), _build(0),
+                  _partially_initialized(false),
                   _thread_park_blocker(false), _post_vm_init_hook_enabled(false)
                   {}
 
   JDK_Version(uint8_t major, uint8_t minor = 0, uint8_t security = 0,
-              uint8_t update = 0, uint8_t special = 0, uint8_t build = 0,
+              uint8_t patch = 0, uint8_t build = 0,
               bool thread_park_blocker = false, bool post_vm_init_hook_enabled = false) :
-      _major(major), _minor(minor), _security(security), _update(update),
-      _special(special), _build(build), _partially_initialized(false),
+      _major(major), _minor(minor), _security(security), _patch(patch),
+      _build(build), _partially_initialized(false),
       _thread_park_blocker(thread_park_blocker),
       _post_vm_init_hook_enabled(post_vm_init_hook_enabled)
       {}
 
   // Returns the current running JDK version

@@ -131,29 +126,24 @@
   // Factory methods for convenience
   static JDK_Version jdk(uint8_t m) {
     return JDK_Version(m);
   }
 
-  static JDK_Version jdk_update(uint8_t major, uint8_t update_number) {
-    return JDK_Version(major, 0, 0, update_number);
-  }
-
   uint8_t major_version() const          { return _major; }
   uint8_t minor_version() const          { return _minor; }
   uint8_t security_version() const          { return _security; }
-  uint8_t update_version() const         { return _update; }
-  uint8_t special_update_version() const { return _special; }
+  uint8_t patch_version() const          { return _patch; }
   uint8_t build_number() const           { return _build; }
 
   bool supports_thread_park_blocker() const {
     return _thread_park_blocker;
   }
   bool post_vm_init_hook_enabled() const {
     return _post_vm_init_hook_enabled;
   }
 
-  // Performs a full ordering comparison using all fields (update, build, etc.)
+  // Performs a full ordering comparison using all fields (patch, build, etc.)
   int compare(const JDK_Version& other) const;
 
   /**
    * Performs comparison using only the major version, returning negative
    * if the major version of 'this' is less than the parameter, 0 if it is