--- old/src/solaris/classes/sun/nio/fs/SolarisAclFileAttributeView.java	Wed Jan 26 14:12:55 2011
+++ new/src/solaris/classes/sun/nio/fs/SolarisAclFileAttributeView.java	Wed Jan 26 14:12:54 2011
@@ -198,7 +198,7 @@
      * Decode the buffer, returning an ACL
      */
     private static List<AclEntry> decode(long address, int n) {
-        ArrayList<AclEntry> acl = new ArrayList<AclEntry>(n);
+        ArrayList<AclEntry> acl = new ArrayList<>(n);
         for (int i=0; i<n; i++) {
             long offset = address + i*SIZEOF_ACE_T;
 
@@ -244,7 +244,7 @@
                     assert false;
             }
 
-            HashSet<AclEntryPermission> aceMask = new HashSet<AclEntryPermission>();
+            HashSet<AclEntryPermission> aceMask = new HashSet<>();
             if ((mask & ACE_READ_DATA) > 0)
                 aceMask.add(AclEntryPermission.READ_DATA);
             if ((mask & ACE_WRITE_DATA) > 0)
@@ -274,7 +274,7 @@
             if ((mask & ACE_SYNCHRONIZE) > 0)
                 aceMask.add(AclEntryPermission.SYNCHRONIZE);
 
-            HashSet<AclEntryFlag> aceFlags = new HashSet<AclEntryFlag>();
+            HashSet<AclEntryFlag> aceFlags = new HashSet<>();
             if ((flags & ACE_FILE_INHERIT_ACE) > 0)
                 aceFlags.add(AclEntryFlag.FILE_INHERIT);
             if ((flags & ACE_DIRECTORY_INHERIT_ACE) > 0)