--- a/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java	Mon Jul 25 14:35:13 2011 -0700
+++ b/jdk/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.