--- old/src/java.base/unix/classes/sun/nio/fs/UnixPath.java	2015-04-22 17:44:23.375423485 -0700
+++ new/src/java.base/unix/classes/sun/nio/fs/UnixPath.java	2015-04-22 17:44:23.203423481 -0700
@@ -121,7 +121,7 @@
             ce = Util.jnuEncoding().newEncoder()
                 .onMalformedInput(CodingErrorAction.REPORT)
                 .onUnmappableCharacter(CodingErrorAction.REPORT);
-            encoder.set(new SoftReference<CharsetEncoder>(ce));
+            encoder.set(new SoftReference<>(ce));
         }
 
         char[] ca = fs.normalizeNativePath(input.toCharArray());