stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8160018: (fs) Remove GioFileTypeDetector on Solaris

Browse Source 
Remove the GioFileTypeDetector from the chain of FileTypeDetectors provided by SolarisFileSystemProvider.

Reviewed-by: rriggs
This commit is contained in:
Brian Burkhalter 2016-07-01 12:55:23 -07:00
parent 70e069ea5d
commit 7f9465ef15
5 changed files with 3 additions and 9 deletions
jdk
make
lib
NioLibraries.gmk
mapfiles/libnio
mapfile-solaris
src/java.base
linux
classes/sun/nio/fs
GioFileTypeDetector.java
native/libnio/fs
GioFileTypeDetector.c
solaris/classes/sun/nio/fs
SolarisFileSystemProvider.java

5
jdk/make/lib/NioLibraries.gmk

@ -1,5 +1,5 @@
#
# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@ -46,9 +46,6 @@ endif
ifeq ($(OPENJDK_TARGET_OS), macosx)
BUILD_LIBNIO_MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libnio/mapfile-$(OPENJDK_TARGET_OS)
BUILD_LIBNIO_EXFILES += \
GioFileTypeDetector.c \
#
endif
ifeq ($(OPENJDK_TARGET_OS), solaris)

2
jdk/make/mapfiles/libnio/mapfile-solaris

@ -131,8 +131,6 @@ SUNWprivate_1.1 {
Java_sun_nio_ch_SolarisEventPort_port_1get;
Java_sun_nio_ch_SolarisEventPort_port_1getn;
Java_sun_nio_ch_SolarisEventPort_port_1send;
Java_sun_nio_fs_GioFileTypeDetector_initializeGio;
Java_sun_nio_fs_GioFileTypeDetector_probeGio;
Java_sun_nio_fs_UnixNativeDispatcher_init;
Java_sun_nio_fs_UnixNativeDispatcher_getcwd;
Java_sun_nio_fs_UnixNativeDispatcher_strerror;

0
jdk/src/java.base/unix/classes/sun/nio/fs/GioFileTypeDetector.java → jdk/src/java.base/linux/classes/sun/nio/fs/GioFileTypeDetector.java

0
jdk/src/java.base/unix/native/libnio/fs/GioFileTypeDetector.c → jdk/src/java.base/linux/native/libnio/fs/GioFileTypeDetector.c

5
jdk/src/java.base/solaris/classes/sun/nio/fs/SolarisFileSystemProvider.java

@ -1,5 +1,5 @@
/*
* Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2008, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -88,8 +88,7 @@ public class SolarisFileSystemProvider extends UnixFileSystemProvider {
GetPropertyAction.privilegedGetProperty("user.home"), ".mime.types");
Path etcMimeTypes = Paths.get("/etc/mime.types");
return chain(new GioFileTypeDetector(),
new MimeTypesFileTypeDetector(userMimeTypes),
return chain(new MimeTypesFileTypeDetector(userMimeTypes),
new MimeTypesFileTypeDetector(etcMimeTypes));
}
}