From 7f9465ef1569450a05b7438f5b7be82527ab5bbd Mon Sep 17 00:00:00 2001 From: Brian Burkhalter Date: Fri, 1 Jul 2016 12:55:23 -0700 Subject: [PATCH] 8160018: (fs) Remove GioFileTypeDetector on Solaris Remove the GioFileTypeDetector from the chain of FileTypeDetectors provided by SolarisFileSystemProvider. Reviewed-by: rriggs --- jdk/make/lib/NioLibraries.gmk | 5 +---- jdk/make/mapfiles/libnio/mapfile-solaris | 2 -- .../classes/sun/nio/fs/GioFileTypeDetector.java | 0 .../{unix => linux}/native/libnio/fs/GioFileTypeDetector.c | 0 .../classes/sun/nio/fs/SolarisFileSystemProvider.java | 5 ++--- 5 files changed, 3 insertions(+), 9 deletions(-) rename jdk/src/java.base/{unix => linux}/classes/sun/nio/fs/GioFileTypeDetector.java (100%) rename jdk/src/java.base/{unix => linux}/native/libnio/fs/GioFileTypeDetector.c (100%) diff --git a/jdk/make/lib/NioLibraries.gmk b/jdk/make/lib/NioLibraries.gmk index 203447c513f..053763506f9 100644 --- a/jdk/make/lib/NioLibraries.gmk +++ b/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) diff --git a/jdk/make/mapfiles/libnio/mapfile-solaris b/jdk/make/mapfiles/libnio/mapfile-solaris index a38701ab3b5..d7a9da908ca 100644 --- a/jdk/make/mapfiles/libnio/mapfile-solaris +++ b/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; diff --git a/jdk/src/java.base/unix/classes/sun/nio/fs/GioFileTypeDetector.java b/jdk/src/java.base/linux/classes/sun/nio/fs/GioFileTypeDetector.java similarity index 100% rename from jdk/src/java.base/unix/classes/sun/nio/fs/GioFileTypeDetector.java rename to jdk/src/java.base/linux/classes/sun/nio/fs/GioFileTypeDetector.java diff --git a/jdk/src/java.base/unix/native/libnio/fs/GioFileTypeDetector.c b/jdk/src/java.base/linux/native/libnio/fs/GioFileTypeDetector.c similarity index 100% rename from jdk/src/java.base/unix/native/libnio/fs/GioFileTypeDetector.c rename to jdk/src/java.base/linux/native/libnio/fs/GioFileTypeDetector.c diff --git a/jdk/src/java.base/solaris/classes/sun/nio/fs/SolarisFileSystemProvider.java b/jdk/src/java.base/solaris/classes/sun/nio/fs/SolarisFileSystemProvider.java index c50b4a8b7f0..bef7decb1c9 100644 --- a/jdk/src/java.base/solaris/classes/sun/nio/fs/SolarisFileSystemProvider.java +++ b/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)); } }