infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-05-11 05:59:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

7177701: error: Filling jar message during javax/imageio/metadata/IIOMetadataFormatImpl compilation

Browse Source 
Recent JDK hash changes affected order in which files are returned from JavacFileManager.list()

Reviewed-by: jjg
This commit is contained in:
Maurizio Cimadamore 2012-06-19 13:25:58 +01:00
parent dcfcb3cfc6
commit 288480e312
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
langtools/src/share/classes/com/sun/tools/javac/file/ZipFileIndex.java
View File

@ -36,6 +36,7 @@ import java.util.ArrayList;
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 @@ public class ZipFileIndex {
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 @@ public class ZipFileIndex {
// 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 @@ public class ZipFileIndex {
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();