Mercurial > hg > icedtea7-forest-aarch64 > langtools
changeset 1280:cee31ee38a19 icedtea-2.3-branchpoint
Merge jdk7u6-b18
author | andrew |
---|---|
date | Wed, 11 Jul 2012 01:36:19 +0100 |
parents | 480d4eb554fc (current diff) 6aa859ef4287 (diff) |
children | ae32e5eaa21b |
files | .hgtags |
diffstat | 2 files changed, 6 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Fri Jun 29 15:20:21 2012 +0100 +++ b/.hgtags Wed Jul 11 01:36:19 2012 +0100 @@ -196,3 +196,4 @@ 35b2699c6243e9fb33648c2c25e97ec91d0e3553 jdk7u6-b14 47ae28da508861d77ee6dd408d822acf507b28ec jdk7u6-b15 5c7763489f4d2727c6d9de11f4114fb8ed839042 jdk7u6-b16 +66c671f28cb2840ceec5b44c44bac073fc0b4256 jdk7u6-b17
--- a/src/share/classes/com/sun/tools/javac/file/ZipFileIndex.java Fri Jun 29 15:20:21 2012 +0100 +++ b/src/share/classes/com/sun/tools/javac/file/ZipFileIndex.java Wed Jul 11 01:36:19 2012 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -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();