Skip to content
Prev Previous commit
Next Next commit
Remove TODOs now jimage version is bumped
  • Loading branch information
david-beaumont committed Nov 3, 2025
commit e84e7a8f8ad1c429a7dce28ad092c6fcd4efb93a
7 changes: 1 addition & 6 deletions src/java.base/share/native/libjimage/imageFile.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -319,12 +319,7 @@ bool ImageFileReader::open() {
!read_at((u1*)&_header, header_size, 0) ||
_header.magic(_endian) != IMAGE_MAGIC ||
_header.major_version(_endian) != MAJOR_VERSION ||
// Temporarily, we allow either version (1.1 or 1.0) of the file to
// be read so this code can be committed before image writing changes
// for preview mode. Preview mode changes do not modify any structure,
// so a 1.0 file will look like a jimage without any preview resources.
// TODO: Restore equality check for MINOR_VERSION.
_header.minor_version(_endian) > MINOR_VERSION) {
_header.minor_version(_endian) != MINOR_VERSION) {
close();
return false;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@ private ImageLocationWriter addAttribute(int kind, String value) {
}

static ImageLocationWriter newLocation(String fullName,
ImageStringsWriter strings,
long contentOffset, long compressedSize, long uncompressedSize, int previewFlags) {
ImageStringsWriter strings,
long contentOffset, long compressedSize, long uncompressedSize, int previewFlags) {
String moduleName = "";
String parentName = "";
String baseName;
Expand Down