src/share/vm/runtime/java.cpp

rev 8203 : imported patch remove_config

*** 649,663 ****
        // We represent "1.5.0" as "5.0", but 1.4.2 as itself.
        major = minor;
        minor = micro;
        micro = 0;
      }
      _current = JDK_Version(major, minor, micro, info.update_version,
                             info.special_update_version, build,
                             info.thread_park_blocker == 1,
!                            info.post_vm_init_hook_enabled == 1,
!                            info.pending_list_uses_discovered_field == 1);
    }
  }
  
  void JDK_Version::fully_initialize(
      uint8_t major, uint8_t minor, uint8_t micro, uint8_t update) {
--- 649,667 ----
        // We represent "1.5.0" as "5.0", but 1.4.2 as itself.
        major = minor;
        minor = micro;
        micro = 0;
      }
+     // 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, micro, 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 micro, uint8_t update) {