--- old/src/java.base/share/classes/sun/nio/ch/SocketChannelImpl.java	2015-04-22 17:44:13.775423263 -0700
+++ new/src/java.base/share/classes/sun/nio/ch/SocketChannelImpl.java	2015-04-22 17:44:13.599423258 -0700
@@ -229,7 +229,7 @@
         static final Set<SocketOption<?>> defaultOptions = defaultOptions();
 
         private static Set<SocketOption<?>> defaultOptions() {
-            HashSet<SocketOption<?>> set = new HashSet<SocketOption<?>>(8);
+            HashSet<SocketOption<?>> set = new HashSet<>(8);
             set.add(StandardSocketOptions.SO_SNDBUF);
             set.add(StandardSocketOptions.SO_RCVBUF);
             set.add(StandardSocketOptions.SO_KEEPALIVE);