Mercurial > hg > openjdk > jdk8u > jdk
changeset 4437:c563e8060adf
7069870: Parts of the JDK erroneously rely on generic array initializers with diamond
Reviewed-by: ksrini, mcimadamore
Contributed-by: alexandre.boulgakov@oracle.com
| author | jjg |
|---|---|
| date | Mon, 25 Jul 2011 16:20:39 -0700 |
| parents | 07a12583d4ea |
| children | a80562f7ea50 |
| files | make/tools/src/build/tools/jarsplit/JarSplit.java src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java |
| diffstat | 2 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/make/tools/src/build/tools/jarsplit/JarSplit.java Mon Jul 25 14:35:13 2011 -0700 +++ b/make/tools/src/build/tools/jarsplit/JarSplit.java Mon Jul 25 16:20:39 2011 -0700 @@ -43,8 +43,8 @@ /* classlist[0] contains class file list * classlist[1] contains non-class file list */ - @SuppressWarnings("unchecked") - private static Vector<String>[] classlist = new Vector<>[2]; + @SuppressWarnings({ "unchecked", "rawtypes" }) + private static Vector<String>[] classlist = new Vector[2]; /* The 2 class list name passed as arguments. */ private static String[] fileNamelist = new String[2];
--- a/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java Mon Jul 25 14:35:13 2011 -0700 +++ b/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java Mon Jul 25 16:20:39 2011 -0700 @@ -780,9 +780,9 @@ avHiBits &= (1L<<attrIndexLimit[i])-1; int nextLoBit = 0; Map<Attribute.Layout, int[]> defMap = allLayouts.get(i); - @SuppressWarnings("unchecked") + @SuppressWarnings({ "unchecked", "rawtypes" }) Map.Entry<Attribute.Layout, int[]>[] layoutsAndCounts = - new Map.Entry<>[defMap.size()]; + new Map.Entry[defMap.size()]; defMap.entrySet().toArray(layoutsAndCounts); // Sort by count, most frequent first. // Predefs. participate in this sort, though it does not matter.