Mercurial > hg > icedtea7-forest-aarch64 > langtools
changeset 1666:e3eeee75b861 ppc-aix-port-b01 ppc-aix-port-b02 ppc-aix-port-b03
7177701: error: Filling jar message during javax/imageio/metadata/IIOMetadataFormatImpl compilation
Summary: Recent JDK hash changes affected order in which files are returned from JavacFileManager.list()
Reviewed-by: jjg
author | mcimadamore |
---|---|
date | Tue, 19 Jun 2012 13:25:58 +0100 |
parents | fcebf337f5c1 |
children | ed96856ec2d2 |
files | src/share/classes/com/sun/tools/javac/file/ZipFileIndex.java |
diffstat | 1 files changed, 4 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/classes/com/sun/tools/javac/file/ZipFileIndex.java Fri Jun 01 11:47:04 2012 -0700 +++ b/src/share/classes/com/sun/tools/javac/file/ZipFileIndex.java Tue Jun 19 13:25:58 2012 +0100 @@ -36,6 +36,7 @@ import java.util.Arrays; import java.util.Calendar; import java.util.Collections; +import java.util.LinkedHashMap; import java.util.HashMap; import java.util.HashSet; import java.util.List; @@ -284,7 +285,7 @@ try { checkIndex(); if (allDirs == Collections.EMPTY_SET) { - allDirs = new HashSet<RelativeDirectory>(directories.keySet()); + allDirs = new java.util.LinkedHashSet<RelativeDirectory>(directories.keySet()); } return allDirs; @@ -572,7 +573,7 @@ // Add each of the files if (entryCount > 0) { - directories = new HashMap<RelativeDirectory, DirectoryEntry>(); + directories = new LinkedHashMap<RelativeDirectory, DirectoryEntry>(); ArrayList<Entry> entryList = new ArrayList<Entry>(); int pos = 2; for (int i = 0; i < entryCount; i++) { @@ -867,7 +868,7 @@ if (zipFile.lastModified() != fileStamp) { ret = false; } else { - directories = new HashMap<RelativeDirectory, DirectoryEntry>(); + directories = new LinkedHashMap<RelativeDirectory, DirectoryEntry>(); int numDirs = raf.readInt(); for (int nDirs = 0; nDirs < numDirs; nDirs++) { int dirNameBytesLen = raf.readInt();