--- old/src/java.base/share/classes/sun/nio/ch/MembershipRegistry.java	2015-04-22 17:44:12.455423232 -0700
+++ new/src/java.base/share/classes/sun/nio/ch/MembershipRegistry.java	2015-04-22 17:44:12.287423228 -0700
@@ -84,13 +84,13 @@
         InetAddress group = key.group();
         List<MembershipKeyImpl> keys;
         if (groups == null) {
-            groups = new HashMap<InetAddress,List<MembershipKeyImpl>>();
+            groups = new HashMap<>();
             keys = null;
         } else {
             keys = groups.get(group);
         }
         if (keys == null) {
-            keys = new LinkedList<MembershipKeyImpl>();
+            keys = new LinkedList<>();
             groups.put(group, keys);
         }
         keys.add(key);