diff -r 0c0578b802b1 -r 111342b28e67 jdk/src/solaris/classes/sun/nio/fs/MacOSXFileSystemProvider.java --- a/jdk/src/solaris/classes/sun/nio/fs/MacOSXFileSystemProvider.java Mon Dec 03 11:07:20 2012 -0500 +++ b/jdk/src/solaris/classes/sun/nio/fs/MacOSXFileSystemProvider.java Tue Dec 04 14:07:30 2012 +0000 @@ -25,9 +25,11 @@ package sun.nio.fs; -import java.nio.file.*; -import java.nio.file.attribute.*; -import java.io.IOException; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.nio.file.spi.FileTypeDetector; +import java.security.AccessController; +import sun.security.action.GetPropertyAction; /** * MacOSX implementation of FileSystemProvider @@ -42,4 +44,11 @@ MacOSXFileSystem newFileSystem(String dir) { return new MacOSXFileSystem(this, dir); } + + @Override + FileTypeDetector getFileTypeDetector() { + Path userMimeTypes = Paths.get(AccessController.doPrivileged( + new GetPropertyAction("user.home")), ".mime.types"); + return new MimeTypesFileTypeDetector(userMimeTypes); + } }