--- old/src/java.base/share/classes/sun/nio/ch/ServerSocketChannelImpl.java	2015-04-22 17:44:13.339423252 -0700
+++ new/src/java.base/share/classes/sun/nio/ch/ServerSocketChannelImpl.java	2015-04-22 17:44:13.171423249 -0700
@@ -182,7 +182,7 @@
         static final Set<SocketOption<?>> defaultOptions = defaultOptions();
 
         private static Set<SocketOption<?>> defaultOptions() {
-            HashSet<SocketOption<?>> set = new HashSet<SocketOption<?>>(2);
+            HashSet<SocketOption<?>> set = new HashSet<>(2);
             set.add(StandardSocketOptions.SO_RCVBUF);
             set.add(StandardSocketOptions.SO_REUSEADDR);
             set.add(StandardSocketOptions.IP_TOS);