--- a/jdk/.hgtags Fri Mar 25 15:35:43 2016 +0300
+++ b/jdk/.hgtags Tue Mar 29 13:43:29 2016 +0200
@@ -353,3 +353,4 @@
42794e648cfe9fd67461dcbe8b7594241a84bcff jdk-9+108
1c7bad0798900fe58f4db01ae7ffdc84f5baee8c jdk-9+109
9417e1bcded6af5532c3b26235437ab227758877 jdk-9+110
+b2a69d66dc65ad1d3aeb3bd362cf5bb0deba040e jdk-9+111
--- a/jdk/make/gensrc/GensrcMisc.gmk Fri Mar 25 15:35:43 2016 +0300
+++ b/jdk/make/gensrc/GensrcMisc.gmk Tue Mar 29 13:43:29 2016 +0200
@@ -23,7 +23,7 @@
# questions.
#
-##########################################################################################
+################################################################################
# Install the launcher name, release version string, full version
# string and the runtime name into the VersionProps.java file.
@@ -39,110 +39,68 @@
GENSRC_JAVA_BASE += $(BUILD_VERSION_JAVA)
-##########################################################################################
-
-GENSRC_JAVA_BASE += $(SUPPORT_OUTPUTDIR)/gensrc/java.base/sun/nio/ch/SocketOptionRegistry.java
-
-GENSRC_SOR_SRC := $(JDK_TOPDIR)/make/src/native/genconstants/ch
-GENSRC_SOR_SRC_FILE := genSocketOptionRegistry.c
-GENSRC_SOR_BIN := $(BUILDTOOLS_OUTPUTDIR)/native/genSocketOptionRegistry
-
-SOR_COPYRIGHT_YEARS = $(shell $(CAT) $(GENSRC_SOR_SRC)/$(GENSRC_SOR_SRC_FILE) | \
- $(NAWK) '/^.*Copyright.*Oracle/ { printf "%s %s",$$4,$$5 }')
+################################################################################
-$(eval $(call SetupNativeCompilation, BUILD_GENSRC_SOR_EXE, \
- SRC := $(GENSRC_SOR_SRC), \
- INCLUDE_FILES := $(GENSRC_SOR_SRC_FILE), \
- CFLAGS_windows := -nologo, \
- LDFLAGS_windows := -nologo, \
- TOOLCHAIN := TOOLCHAIN_BUILD, \
- OBJECT_DIR := $(GENSRC_SOR_BIN), \
- OUTPUT_DIR := $(GENSRC_SOR_BIN), \
- PROGRAM := genSocketOptionRegistry))
-
-SOR_PREGEN_FILE := $(JDK_TOPDIR)/src/closed/java.base/$(OPENJDK_TARGET_OS)/classes/sun/nio/ch/SocketOptionRegistry-$(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_ARCH).java.template
-
-ifeq ($(wildcard $(SOR_PREGEN_FILE)), )
- $(SUPPORT_OUTPUTDIR)/gensrc/java.base/sun/nio/ch/SocketOptionRegistry.java: $(BUILD_GENSRC_SOR_EXE_TARGET)
- $(MKDIR) -p $(@D)
- $(RM) $@ $@.tmp
- NAWK="$(NAWK)" SH="$(SH)" $(SH) -e \
- $(JDK_TOPDIR)/make/scripts/addNotices.sh "$(SOR_COPYRIGHT_YEARS)" > $@.tmp
- $(BUILD_GENSRC_SOR_EXE_TARGET) >> $@.tmp
- $(MV) $@.tmp $@
-else
- $(SUPPORT_OUTPUTDIR)/gensrc/java.base/sun/nio/ch/SocketOptionRegistry.java: $(SOR_PREGEN_FILE)
- $(call install-file)
+ifneq ($(filter $(TOOLCHAIN_TYPE), gcc clang), )
+ # Need to specify language since the template file has a non standard
+ # extension.
+ CPP_FLAGS += -x c
+else ifeq ($(TOOLCHAIN_TYPE), microsoft)
+ CPP_FLAGS += -nologo
endif
-##########################################################################################
+# Generate a java source file from a template through the C preprocessor for the
+# target system. First extract the copyright notice at the start of the file.
+# Run the preprocessor. Filter out the default compiler stderr output on
+# Windows. Filter out all the header files output. Remove all "PREFIX_" strings
+# that were added to variable references in the template files to avoid being
+# matched by the preprocessor. Remove any #line directives left by the
+# preprocessor.
+define generate-preproc-src
+ $(call MakeDir, $(@D))
+ ( $(NAWK) '/@@END_COPYRIGHT@@/{exit}1' $< && \
+ $(CPP) $(CPP_FLAGS) $(SYSROOT_CFLAGS) $< \
+ 2> >($(GREP) -v '^$(<F)$$' >&2) \
+ | $(NAWK) '/@@START_HERE@@/,0' \
+ | $(SED) -e 's/@@START_HERE@@/\/\/ AUTOMATICALLY GENERATED FILE - DO NOT EDIT/' \
+ -e 's/PREFIX_//' -e 's/^#.*//' \
+ ) > $@
+endef
+
+GENSRC_SOR_FILE += $(SUPPORT_OUTPUTDIR)/gensrc/java.base/sun/nio/ch/SocketOptionRegistry.java
+
+$(GENSRC_SOR_FILE): \
+ $(JDK_TOPDIR)/src/java.base/share/classes/sun/nio/ch/SocketOptionRegistry.java.template
+ $(generate-preproc-src)
+
+GENSRC_JAVA_BASE += $(GENSRC_SOR_FILE)
+
+################################################################################
ifneq ($(OPENJDK_TARGET_OS), windows)
- GENSRC_JAVA_BASE += $(SUPPORT_OUTPUTDIR)/gensrc/java.base/sun/nio/fs/UnixConstants.java
-
- GENSRC_UC_SRC := $(JDK_TOPDIR)/make/src/native/genconstants/fs
- GENSRC_UC_SRC_FILE := genUnixConstants.c
- GENSRC_UC_BIN := $(BUILDTOOLS_OUTPUTDIR)/native/genUnixConstants
-
- UC_COPYRIGHT_YEARS = $(shell $(CAT) $(GENSRC_UC_SRC)/$(GENSRC_UC_SRC_FILE) | \
- $(NAWK) '/^.*Copyright.*Oracle/ { printf "%s %s",$$4,$$5 }')
+ GENSRC_UC_FILE := $(SUPPORT_OUTPUTDIR)/gensrc/java.base/sun/nio/fs/UnixConstants.java
- $(eval $(call SetupNativeCompilation, BUILD_GENSRC_UC_EXE, \
- SRC := $(GENSRC_UC_SRC), \
- INCLUDE_FILES := $(GENSRC_UC_SRC_FILE), \
- TOOLCHAIN := TOOLCHAIN_BUILD, \
- OBJECT_DIR := $(GENSRC_UC_BIN), \
- OUTPUT_DIR := $(GENSRC_UC_BIN), \
- PROGRAM := genUnixConstants))
-
- UC_PREGEN_FILE := $(JDK_TOPDIR)/src/closed/java.base/$(OPENJDK_TARGET_OS)/classes/sun/nio/fs/UnixConstants-$(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_ARCH).java.template
+ $(GENSRC_UC_FILE): \
+ $(JDK_TOPDIR)/src/java.base/unix/classes/sun/nio/fs/UnixConstants.java.template
+ $(generate-preproc-src)
- ifeq ($(wildcard $(UC_PREGEN_FILE)), )
- $(SUPPORT_OUTPUTDIR)/gensrc/java.base/sun/nio/fs/UnixConstants.java: $(BUILD_GENSRC_UC_EXE_TARGET)
- $(MKDIR) -p $(@D)
- $(RM) $@ $@.tmp
- NAWK="$(NAWK)" SH="$(SH)" $(SH) -e \
- $(JDK_TOPDIR)/make/scripts/addNotices.sh "$(UC_COPYRIGHT_YEARS)" > $@.tmp
- $(BUILD_GENSRC_UC_EXE_TARGET) >> $@.tmp
- $(MV) $@.tmp $@
- else
- $(SUPPORT_OUTPUTDIR)/gensrc/java.base/sun/nio/fs/UnixConstants.java: $(UC_PREGEN_FILE)
- $(call install-file)
- endif
+ GENSRC_JAVA_BASE += $(GENSRC_UC_FILE)
endif
-##########################################################################################
+################################################################################
ifeq ($(OPENJDK_TARGET_OS), solaris)
- GENSRC_JAVA_BASE += $(SUPPORT_OUTPUTDIR)/gensrc/java.base/sun/nio/fs/SolarisConstants.java
-
- GENSRC_SOL_SRC := $(JDK_TOPDIR)/make/src/native/genconstants/fs
- GENSRC_SOL_SRC_FILE := genSolarisConstants.c
- GENSRC_SOL_BIN := $(BUILDTOOLS_OUTPUTDIR)/native/genSolarisConstants
-
- SOL_COPYRIGHT_YEARS = $(shell $(CAT) $(GENSRC_SOL_SRC)/$(GENSRC_SOL_SRC_FILE) | \
- $(NAWK) '/^.*Copyright.*Oracle/ { printf "%s %s",$$4,$$5 }')
+ GENSRC_SC_FILE := $(SUPPORT_OUTPUTDIR)/gensrc/java.base/sun/nio/fs/SolarisConstants.java
- $(eval $(call SetupNativeCompilation, BUILD_GENSRC_SOL_EXE, \
- SRC := $(GENSRC_SOL_SRC), \
- INCLUDE_FILES := $(GENSRC_SOL_SRC_FILE), \
- TOOLCHAIN := TOOLCHAIN_BUILD, \
- OBJECT_DIR := $(GENSRC_SOL_BIN), \
- OUTPUT_DIR := $(GENSRC_SOL_BIN), \
- PROGRAM := genSolarisConstants))
+ $(GENSRC_SC_FILE): \
+ $(JDK_TOPDIR)/src/java.base/solaris/classes/sun/nio/fs/SolarisConstants.java.template
+ $(generate-preproc-src)
- $(SUPPORT_OUTPUTDIR)/gensrc/java.base/sun/nio/fs/SolarisConstants.java: $(BUILD_GENSRC_SOL_EXE_TARGET)
- $(MKDIR) -p $(@D)
- $(RM) $@ $@.tmp
- NAWK="$(NAWK)" SH="$(SH)" $(SH) -e \
- $(JDK_TOPDIR)/make/scripts/addNotices.sh "$(SOL_COPYRIGHT_YEARS)" > $@.tmp
- $(BUILD_GENSRC_SOL_EXE_TARGET) >> $@.tmp
- $(MV) $@.tmp $@
-
+ GENSRC_JAVA_BASE += $(GENSRC_SC_FILE)
endif
-##########################################################################################
+################################################################################
--- a/jdk/make/gensrc/GensrcModuleLoaderMap.gmk Fri Mar 25 15:35:43 2016 +0300
+++ b/jdk/make/gensrc/GensrcModuleLoaderMap.gmk Tue Mar 29 13:43:29 2016 +0200
@@ -25,103 +25,7 @@
include Modules.gmk
-BOOT_MODULES :=
-UPGRADEABLE_MDOULES :=
-AGGREGATOR_MDOULES :=
-OTHER_PLATFORM_MODULES :=
-
-# Hook to include the corresponding custom file, if present.
-$(eval $(call IncludeCustomExtension, jdk, gensrc/GensrcModuleLoaderMap.gmk))
-
-BOOT_MODULES += \
- java.base \
- java.datatransfer \
- java.desktop \
- java.httpclient \
- java.instrument \
- java.logging \
- java.management \
- java.naming \
- java.prefs \
- java.rmi \
- java.security.jgss \
- java.security.sasl \
- java.sql \
- java.xml \
- java.xml.crypto \
- jdk.httpserver \
- jdk.management \
- jdk.sctp \
- jdk.security.auth \
- jdk.security.jgss \
- #
-
-# to be deprivileged
-BOOT_MODULES += \
- java.compiler \
- java.scripting \
- java.sql.rowset \
- java.smartcardio \
- jdk.charsets \
- jdk.naming.rmi \
- #
-
-UPGRADEABLE_MODULES += \
- java.activation \
- java.annotations.common \
- java.corba \
- java.transaction \
- java.xml.bind \
- java.xml.ws \
- #
-
-AGGREGATOR_MODULES += \
- java.compact1 \
- java.compact2 \
- java.compact3 \
- java.se \
- java.se.ee \
- #
-
-OTHER_PLATFORM_MODULES += \
- jdk.accessibility \
- jdk.crypto.ec \
- jdk.crypto.pkcs11 \
- jdk.dynalink \
- jdk.jsobject \
- jdk.xml.dom \
- jdk.localedata \
- jdk.naming.dns \
- jdk.scripting.nashorn \
- jdk.zipfs \
- #
-
-ifeq ($(OPENJDK_TARGET_OS), macsox)
- BOOT_MODULES += jdk.deploy.osx
-endif
-ifeq ($(OPENJDK_TARGET_OS), windows)
- OTHER_PLATFORM_MODULES += jdk.crypto.mscapi
-endif
-ifeq ($(OPENJDK_TARGET_OS), solaris)
- OTHER_PLATFORM_MODULES += jdk.crypto.ucrypto
-endif
-
-# Param 1 - Name of module
-define ReadImportMetaData
- ifneq ($$(wildcard $(IMPORT_MODULES_MAKE)/$$(strip $1)/build.properties), )
- classloader :=
- include $(IMPORT_MODULES_MAKE)/$$(strip $1)/build.properties
- ifeq ($$(classloader), boot)
- BOOT_MODULES += $1
- else ifeq ($$(classloader), ext)
- OTHER_PLATFORM_MODULES += $1
- endif
- endif
-endef
-
-IMPORTED_MODULES := $(call FindImportedModules)
-$(foreach m, $(IMPORTED_MODULES), $(eval $(call ReadImportMetaData, $m)))
-
+$(eval $(call ReadImportMetaData))
# Replacing double-comma with a single comma is to workaround the issue
# with some version of make on windows that doesn't substitute spaces
@@ -132,7 +36,7 @@
)
endef
BOOT_MODULES_LIST := $(call SubstComma, $(BOOT_MODULES))
-PLATFORM_MODULES_LIST := $(call SubstComma, $(UPGRADEABLE_MODULES) $(AGGREGATOR_MODULES) $(OTHER_PLATFORM_MODULES))
+PLATFORM_MODULES_LIST := $(call SubstComma, $(PLATFORM_MODULES))
VARDEPS_VALUE := $(BOOT_MODULES_LIST) $(PLATFORM_MODULES_LIST)
VARDEPS_FILE := $(call DependOnVariable, VARDEPS_VALUE)
--- a/jdk/make/launcher/Launcher-jdk.scripting.nashorn.shell.gmk Fri Mar 25 15:35:43 2016 +0300
+++ b/jdk/make/launcher/Launcher-jdk.scripting.nashorn.shell.gmk Tue Mar 29 13:43:29 2016 +0200
@@ -27,5 +27,6 @@
$(eval $(call SetupBuildLauncher, jjs, \
MAIN_CLASS := jdk.nashorn.tools.jjs.Main, \
+ JAVA_ARGS := -addmods ALL-SYSTEM, \
CFLAGS := -DENABLE_ARG_FILES, \
))
--- a/jdk/make/src/native/genconstants/ch/genSocketOptionRegistry.c Fri Mar 25 15:35:43 2016 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,147 +0,0 @@
-/*
- * 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-#include <stdio.h>
-#ifdef _WIN32
-#include <winsock2.h>
-#include <ws2tcpip.h>
-#else
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <netinet/tcp.h>
-#endif
-
-/* Defines SO_REUSEPORT */
-#if !defined(SO_REUSEPORT)
-#ifdef _WIN32
-#define SO_REUSEPORT 0
-#elif __linux__
-#define SO_REUSEPORT 15
-#elif __solaris__
-#define SO_REUSEPORT 0x100e
-#elif defined(AIX) || defined(MACOSX)
-#define SO_REUSEPORT 0x0200
-#else
-#define SO_REUSEPORT 0
-#endif
-#endif
-
-/**
- * Generates sun.nio.ch.SocketOptionRegistry, a class that maps Java-level
- * socket options to the platform specific level and option.
- */
-
-static void out(char* s) {
- printf("%s\n", s);
-}
-
-static void emit(const char *name, char * family, int level, int optname) {
- printf(" map.put(new RegistryKey(%s, %s),", name, family);
- printf(" new OptionKey(%d, %d));\n", level, optname);
-}
-
-static void emit_unspec(const char *name, int level, int optname) {
- emit(name, "Net.UNSPEC", level, optname);
-}
-
-static void emit_inet(const char *name, int level, int optname) {
- emit(name, "StandardProtocolFamily.INET", level, optname);
-}
-
-static void emit_inet6(const char *name, int level, int optname) {
- emit(name, "StandardProtocolFamily.INET6", level, optname);
-}
-
-int main(int argc, const char* argv[]) {
- out("// AUTOMATICALLY GENERATED FILE - DO NOT EDIT ");
- out("package sun.nio.ch; ");
- out("import java.net.SocketOption; ");
- out("import java.net.StandardSocketOptions; ");
- out("import java.net.ProtocolFamily; ");
- out("import java.net.StandardProtocolFamily; ");
- out("import java.util.Map; ");
- out("import java.util.HashMap; ");
- out("class SocketOptionRegistry { ");
- out(" private SocketOptionRegistry() { } ");
- out(" private static class RegistryKey { ");
- out(" private final SocketOption<?> name; ");
- out(" private final ProtocolFamily family; ");
- out(" RegistryKey(SocketOption<?> name, ProtocolFamily family) { ");
- out(" this.name = name; ");
- out(" this.family = family; ");
- out(" } ");
- out(" public int hashCode() { ");
- out(" return name.hashCode() + family.hashCode(); ");
- out(" } ");
- out(" public boolean equals(Object ob) { ");
- out(" if (ob == null) return false; ");
- out(" if (!(ob instanceof RegistryKey)) return false; ");
- out(" RegistryKey other = (RegistryKey)ob; ");
- out(" if (this.name != other.name) return false; ");
- out(" if (this.family != other.family) return false; ");
- out(" return true; ");
- out(" } ");
- out(" } ");
- out(" private static class LazyInitialization { ");
- out(" static final Map<RegistryKey,OptionKey> options = options(); ");
- out(" private static Map<RegistryKey,OptionKey> options() { ");
- out(" Map<RegistryKey,OptionKey> map = ");
- out(" new HashMap<RegistryKey,OptionKey>(); ");
-
- emit_unspec("StandardSocketOptions.SO_BROADCAST", SOL_SOCKET, SO_BROADCAST);
- emit_unspec("StandardSocketOptions.SO_KEEPALIVE", SOL_SOCKET, SO_KEEPALIVE);
- emit_unspec("StandardSocketOptions.SO_LINGER", SOL_SOCKET, SO_LINGER);
- emit_unspec("StandardSocketOptions.SO_SNDBUF", SOL_SOCKET, SO_SNDBUF);
- emit_unspec("StandardSocketOptions.SO_RCVBUF", SOL_SOCKET, SO_RCVBUF);
- emit_unspec("StandardSocketOptions.SO_REUSEADDR", SOL_SOCKET, SO_REUSEADDR);
- emit_unspec("StandardSocketOptions.SO_REUSEPORT", SOL_SOCKET, SO_REUSEPORT);
- emit_unspec("StandardSocketOptions.TCP_NODELAY", IPPROTO_TCP, TCP_NODELAY);
-
- emit_inet("StandardSocketOptions.IP_TOS", IPPROTO_IP, IP_TOS);
- emit_inet("StandardSocketOptions.IP_MULTICAST_IF", IPPROTO_IP, IP_MULTICAST_IF);
- emit_inet("StandardSocketOptions.IP_MULTICAST_TTL", IPPROTO_IP, IP_MULTICAST_TTL);
- emit_inet("StandardSocketOptions.IP_MULTICAST_LOOP", IPPROTO_IP, IP_MULTICAST_LOOP);
-
-#ifdef AF_INET6
- emit_inet6("StandardSocketOptions.IP_TOS", IPPROTO_IPV6, IPV6_TCLASS);
- emit_inet6("StandardSocketOptions.IP_MULTICAST_IF", IPPROTO_IPV6, IPV6_MULTICAST_IF);
- emit_inet6("StandardSocketOptions.IP_MULTICAST_TTL", IPPROTO_IPV6, IPV6_MULTICAST_HOPS);
- emit_inet6("StandardSocketOptions.IP_MULTICAST_LOOP", IPPROTO_IPV6, IPV6_MULTICAST_LOOP);
-#endif
-
- emit_unspec("ExtendedSocketOption.SO_OOBINLINE", SOL_SOCKET, SO_OOBINLINE);
-
- out(" return map; ");
- out(" } ");
- out(" } ");
- out(" public static OptionKey findOption(SocketOption<?> name, ProtocolFamily family) { ");
- out(" RegistryKey key = new RegistryKey(name, family); ");
- out(" return LazyInitialization.options.get(key); ");
- out(" } ");
- out("} ");
-
- return 0;
-}
--- a/jdk/make/src/native/genconstants/fs/genSolarisConstants.c Fri Mar 25 15:35:43 2016 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,105 +0,0 @@
-/*
- * Copyright (c) 2008, 2011, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-#include <stdio.h>
-#include <errno.h>
-#include <unistd.h>
-#include <sys/acl.h>
-#include <fcntl.h>
-#include <sys/stat.h>
-
-/**
- * Generates sun.nio.fs.SolarisConstants
- */
-
-static void out(char* s) {
- printf("%s\n", s);
-}
-
-static void emit(char* name, int value) {
- printf(" static final int %s = %d;\n", name, value);
-}
-
-static void emitX(char* name, int value) {
- printf(" static final int %s = 0x%x;\n", name, value);
-}
-
-#define DEF(X) emit(#X, X);
-#define DEFX(X) emitX(#X, X);
-
-int main(int argc, const char* argv[]) {
- out("// AUTOMATICALLY GENERATED FILE - DO NOT EDIT ");
- out("package sun.nio.fs; ");
- out("class SolarisConstants { ");
- out(" private SolarisConstants() { } ");
-
- // extended attributes
- DEFX(O_XATTR);
- DEF(_PC_XATTR_ENABLED);
-
- // ACL configuration
- DEF(_PC_ACL_ENABLED);
- DEFX(_ACL_ACE_ENABLED);
-
- // ACL commands
- DEFX(ACE_GETACL);
- DEFX(ACE_SETACL);
-
- // ACL mask/flags/types
- emitX("ACE_ACCESS_ALLOWED_ACE_TYPE", 0x0000);
- emitX("ACE_ACCESS_DENIED_ACE_TYPE", 0x0001);
- emitX("ACE_SYSTEM_AUDIT_ACE_TYPE", 0x0002);
- emitX("ACE_SYSTEM_ALARM_ACE_TYPE", 0x0003);
- emitX("ACE_READ_DATA", 0x00000001);
- emitX("ACE_LIST_DIRECTORY", 0x00000001);
- emitX("ACE_WRITE_DATA", 0x00000002);
- emitX("ACE_ADD_FILE", 0x00000002);
- emitX("ACE_APPEND_DATA", 0x00000004);
- emitX("ACE_ADD_SUBDIRECTORY", 0x00000004);
- emitX("ACE_READ_NAMED_ATTRS", 0x00000008);
- emitX("ACE_WRITE_NAMED_ATTRS", 0x00000010);
- emitX("ACE_EXECUTE", 0x00000020);
- emitX("ACE_DELETE_CHILD", 0x00000040);
- emitX("ACE_READ_ATTRIBUTES", 0x00000080);
- emitX("ACE_WRITE_ATTRIBUTES", 0x00000100);
- emitX("ACE_DELETE", 0x00010000);
- emitX("ACE_READ_ACL", 0x00020000);
- emitX("ACE_WRITE_ACL", 0x00040000);
- emitX("ACE_WRITE_OWNER", 0x00080000);
- emitX("ACE_SYNCHRONIZE", 0x00100000);
- emitX("ACE_FILE_INHERIT_ACE", 0x0001);
- emitX("ACE_DIRECTORY_INHERIT_ACE", 0x0002);
- emitX("ACE_NO_PROPAGATE_INHERIT_ACE", 0x0004);
- emitX("ACE_INHERIT_ONLY_ACE", 0x0008);
- emitX("ACE_SUCCESSFUL_ACCESS_ACE_FLAG", 0x0010);
- emitX("ACE_FAILED_ACCESS_ACE_FLAG", 0x0020);
- emitX("ACE_IDENTIFIER_GROUP", 0x0040);
- emitX("ACE_OWNER", 0x1000);
- emitX("ACE_GROUP", 0x2000);
- emitX("ACE_EVERYONE", 0x4000);
-
- out("} ");
- return 0;
-}
--- a/jdk/make/src/native/genconstants/fs/genUnixConstants.c Fri Mar 25 15:35:43 2016 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,142 +0,0 @@
-/*
- * Copyright (c) 2008, 2015, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-#include <stdio.h>
-#include <errno.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <sys/stat.h>
-
-/**
- * Generates sun.nio.fs.UnixConstants
- */
-
-static void out(char* s) {
- printf("%s\n", s);
-}
-
-static void emit(char* name, int value) {
- printf(" static final int %s = %d;\n", name, value);
-}
-
-static void emitX(char* name, int value) {
- printf(" static final int %s = 0x%x;\n", name, value);
-}
-
-#define DEF(X) emit(#X, X);
-#define DEFX(X) emitX(#X, X);
-
-int main(int argc, const char* argv[]) {
- out("// AUTOMATICALLY GENERATED FILE - DO NOT EDIT ");
- out("package sun.nio.fs; ");
- out("class UnixConstants { ");
- out(" private UnixConstants() { } ");
-
- // open flags
- DEF(O_RDONLY);
- DEF(O_WRONLY);
- DEF(O_RDWR);
- DEFX(O_APPEND);
- DEFX(O_CREAT);
- DEFX(O_EXCL);
- DEFX(O_TRUNC);
- DEFX(O_SYNC);
-#ifndef O_DSYNC
- // At least FreeBSD doesn't define O_DSYNC
- emit("O_DSYNC", O_SYNC);
-#else
- DEFX(O_DSYNC);
-#endif
-#ifdef O_NOFOLLOW
- DEFX(O_NOFOLLOW);
-#else
- // not supported (dummy values will not be used at runtime).
- emitX("O_NOFOLLOW", 0x0);
-#endif
-
- // mode masks
- emitX("S_IAMB",
- (S_IRUSR|S_IWUSR|S_IXUSR|S_IRGRP|S_IWGRP|S_IXGRP|S_IROTH|S_IWOTH|S_IXOTH));
- DEF(S_IRUSR);
- DEF(S_IWUSR);
- DEF(S_IXUSR);
- DEF(S_IRGRP);
- DEF(S_IWGRP);
- DEF(S_IXGRP);
- DEF(S_IROTH);
- DEF(S_IWOTH);
- DEF(S_IXOTH);
- DEFX(S_IFMT);
- DEFX(S_IFREG);
- DEFX(S_IFDIR);
- DEFX(S_IFLNK);
- DEFX(S_IFCHR);
- DEFX(S_IFBLK);
- DEFX(S_IFIFO);
-
- // access modes
- DEF(R_OK);
- DEF(W_OK);
- DEF(X_OK);
- DEF(F_OK);
-
- // errors
- DEF(ENOENT);
- DEF(ENXIO);
- DEF(EACCES);
- DEF(EEXIST);
- DEF(ENOTDIR);
- DEF(EINVAL);
- DEF(EXDEV);
- DEF(EISDIR);
- DEF(ENOTEMPTY);
- DEF(ENOSPC);
- DEF(EAGAIN);
- DEF(ENOSYS);
- DEF(ELOOP);
- DEF(EROFS);
-#ifndef ENODATA
- // Only used in Linux java source, provide any value so it compiles
- emit("ENODATA", ELAST);
-#else
- DEF(ENODATA);
-#endif
- DEF(ERANGE);
- DEF(EMFILE);
-
- // flags used with openat/unlinkat/etc.
-#if defined(AT_SYMLINK_NOFOLLOW) && defined(AT_REMOVEDIR)
- DEFX(AT_SYMLINK_NOFOLLOW)
- DEFX(AT_REMOVEDIR);
-#else
- // not supported (dummy values will not be used at runtime).
- emitX("AT_SYMLINK_NOFOLLOW", 0x0);
- emitX("AT_REMOVEDIR", 0x0);
-#endif
-
- out("} ");
-
- return 0;
-}
--- a/jdk/src/java.base/share/classes/java/lang/invoke/StringConcatFactory.java Fri Mar 25 15:35:43 2016 +0300
+++ b/jdk/src/java.base/share/classes/java/lang/invoke/StringConcatFactory.java Tue Mar 29 13:43:29 2016 +0200
@@ -1478,6 +1478,7 @@
* that requires porting if there are private JDK changes occur.
*/
private static final class MethodHandleInlineCopyStrategy {
+ static final Unsafe UNSAFE = Unsafe.getUnsafe();
private MethodHandleInlineCopyStrategy() {
// no instantiation
@@ -1512,10 +1513,9 @@
mh = MethodHandles.dropArguments(NEW_STRING, 2, ptypes);
mh = MethodHandles.dropArguments(mh, 0, int.class);
- // In debug mode, check that remaining index is zero.
- if (DEBUG) {
- mh = MethodHandles.filterArgument(mh, 0, CHECK_INDEX);
- }
+ // Safety: check that remaining index is zero -- that would mean the storage is completely
+ // overwritten, and no leakage of uninitialized data occurred.
+ mh = MethodHandles.filterArgument(mh, 0, CHECK_INDEX);
// Mix in prependers. This happens when (int, byte[], byte) = (index, storage, coder) is already
// known from the combinators below. We are assembling the string backwards, so "index" is the
@@ -1650,13 +1650,13 @@
@ForceInline
private static byte[] newArray(int length, byte coder) {
- return new byte[length << coder];
+ return (byte[]) UNSAFE.allocateUninitializedArray(byte.class, length << coder);
}
@ForceInline
private static int checkIndex(int index) {
if (index != 0) {
- throw new AssertionError("Exactness check failed: " + index + " characters left in the buffer.");
+ throw new IllegalStateException("Storage is not completely initialized, " + index + " bytes left");
}
return index;
}
@@ -1721,12 +1721,7 @@
NEW_STRING = lookupStatic(Lookup.IMPL_LOOKUP, STRING_HELPER, "newString", String.class, byte[].class, byte.class);
NEW_ARRAY = lookupStatic(Lookup.IMPL_LOOKUP, MethodHandleInlineCopyStrategy.class, "newArray", byte[].class, int.class, byte.class);
-
- if (DEBUG) {
- CHECK_INDEX = lookupStatic(Lookup.IMPL_LOOKUP, MethodHandleInlineCopyStrategy.class, "checkIndex", int.class, int.class);
- } else {
- CHECK_INDEX = null;
- }
+ CHECK_INDEX = lookupStatic(Lookup.IMPL_LOOKUP, MethodHandleInlineCopyStrategy.class, "checkIndex", int.class, int.class);
}
}
--- a/jdk/src/java.base/share/classes/java/lang/reflect/Proxy.java Fri Mar 25 15:35:43 2016 +0300
+++ b/jdk/src/java.base/share/classes/java/lang/reflect/Proxy.java Tue Mar 29 13:43:29 2016 +0200
@@ -48,8 +48,8 @@
import jdk.internal.loader.BootLoader;
import jdk.internal.module.Modules;
+import jdk.internal.misc.Unsafe;
import jdk.internal.misc.VM;
-import sun.misc.Unsafe;
import sun.reflect.CallerSensitive;
import sun.reflect.Reflection;
import sun.reflect.misc.ReflectUtil;
--- a/jdk/src/java.base/share/classes/java/math/BigDecimal.java Fri Mar 25 15:35:43 2016 +0300
+++ b/jdk/src/java.base/share/classes/java/math/BigDecimal.java Tue Mar 29 13:43:29 2016 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 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
@@ -286,7 +286,7 @@
private static final BigDecimal ZERO_THROUGH_TEN[] = {
new BigDecimal(BigInteger.ZERO, 0, 0, 1),
new BigDecimal(BigInteger.ONE, 1, 0, 1),
- new BigDecimal(BigInteger.valueOf(2), 2, 0, 1),
+ new BigDecimal(BigInteger.TWO, 2, 0, 1),
new BigDecimal(BigInteger.valueOf(3), 3, 0, 1),
new BigDecimal(BigInteger.valueOf(4), 4, 0, 1),
new BigDecimal(BigInteger.valueOf(5), 5, 0, 1),
@@ -936,7 +936,7 @@
rb = BigInteger.valueOf(5).pow(-exponent).multiply(compactVal);
scl = -exponent;
} else { // (exponent > 0)
- rb = BigInteger.valueOf(2).pow(exponent).multiply(compactVal);
+ rb = BigInteger.TWO.pow(exponent).multiply(compactVal);
}
compactVal = compactValFor(rb);
}
--- a/jdk/src/java.base/share/classes/java/math/BigInteger.java Fri Mar 25 15:35:43 2016 +0300
+++ b/jdk/src/java.base/share/classes/java/math/BigInteger.java Tue Mar 29 13:43:29 2016 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 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
@@ -1266,9 +1266,11 @@
public static final BigInteger ONE = valueOf(1);
/**
- * The BigInteger constant two. (Not exported.)
+ * The BigInteger constant two.
+ *
+ * @since 9
*/
- private static final BigInteger TWO = valueOf(2);
+ public static final BigInteger TWO = valueOf(2);
/**
* The BigInteger constant -1. (Not exported.)
--- a/jdk/src/java.base/share/classes/java/net/URLClassLoader.java Fri Mar 25 15:35:43 2016 +0300
+++ b/jdk/src/java.base/share/classes/java/net/URLClassLoader.java Tue Mar 29 13:43:29 2016 +0200
@@ -49,11 +49,11 @@
import java.util.jar.JarFile;
import java.util.jar.Manifest;
+import jdk.internal.loader.Resource;
+import jdk.internal.loader.URLClassPath;
import jdk.internal.misc.JavaNetAccess;
import jdk.internal.misc.SharedSecrets;
import jdk.internal.perf.PerfCounter;
-import sun.misc.Resource;
-import sun.misc.URLClassPath;
import sun.net.www.ParseUtil;
import sun.security.util.SecurityConstants;
--- a/jdk/src/java.base/share/classes/java/time/Instant.java Fri Mar 25 15:35:43 2016 +0300
+++ b/jdk/src/java.base/share/classes/java/time/Instant.java Tue Mar 29 13:43:29 2016 +0200
@@ -1106,7 +1106,7 @@
* complete units between the two instants.
* The {@code Temporal} passed to this method is converted to a
* {@code Instant} using {@link #from(TemporalAccessor)}.
- * For example, the amount in days between two dates can be calculated
+ * For example, the amount in seconds between two dates can be calculated
* using {@code startInstant.until(endInstant, SECONDS)}.
* <p>
* There are two equivalent ways of using this method.
--- a/jdk/src/java.base/share/classes/jdk/internal/loader/BuiltinClassLoader.java Fri Mar 25 15:35:43 2016 +0300
+++ b/jdk/src/java.base/share/classes/jdk/internal/loader/BuiltinClassLoader.java Tue Mar 29 13:43:29 2016 +0200
@@ -56,8 +56,6 @@
import jdk.internal.module.ModulePatcher.PatchedModuleReader;
import jdk.internal.misc.VM;
-import sun.misc.URLClassPath;
-import sun.misc.Resource;
/**
--- a/jdk/src/java.base/share/classes/jdk/internal/loader/ClassLoaders.java Fri Mar 25 15:35:43 2016 +0300
+++ b/jdk/src/java.base/share/classes/jdk/internal/loader/ClassLoaders.java Tue Mar 29 13:43:29 2016 +0200
@@ -38,7 +38,6 @@
import jdk.internal.misc.JavaLangAccess;
import jdk.internal.misc.SharedSecrets;
import jdk.internal.misc.VM;
-import sun.misc.URLClassPath;
/**
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/java.base/share/classes/jdk/internal/loader/Resource.java Tue Mar 29 13:43:29 2016 +0200
@@ -0,0 +1,188 @@
+/*
+ * Copyright (c) 1998, 2009, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.internal.loader;
+
+import java.io.EOFException;
+import java.net.URL;
+import java.io.IOException;
+import java.io.InterruptedIOException;
+import java.io.InputStream;
+import java.security.CodeSigner;
+import java.util.jar.Manifest;
+import java.nio.ByteBuffer;
+import java.util.Arrays;
+import sun.nio.ByteBuffered;
+
+/**
+ * This class is used to represent a Resource that has been loaded
+ * from the class path.
+ *
+ * @author David Connelly
+ * @since 1.2
+ */
+public abstract class Resource {
+ /**
+ * Returns the name of the Resource.
+ */
+ public abstract String getName();
+
+ /**
+ * Returns the URL of the Resource.
+ */
+ public abstract URL getURL();
+
+ /**
+ * Returns the CodeSource URL for the Resource.
+ */
+ public abstract URL getCodeSourceURL();
+
+ /**
+ * Returns an InputStream for reading the Resource data.
+ */
+ public abstract InputStream getInputStream() throws IOException;
+
+ /**
+ * Returns the length of the Resource data, or -1 if unknown.
+ */
+ public abstract int getContentLength() throws IOException;
+
+ private InputStream cis;
+
+ /* Cache result in case getBytes is called after getByteBuffer. */
+ private synchronized InputStream cachedInputStream() throws IOException {
+ if (cis == null) {
+ cis = getInputStream();
+ }
+ return cis;
+ }
+
+ /**
+ * Returns the Resource data as an array of bytes.
+ */
+ public byte[] getBytes() throws IOException {
+ byte[] b;
+ // Get stream before content length so that a FileNotFoundException
+ // can propagate upwards without being caught too early
+ InputStream in = cachedInputStream();
+
+ // This code has been uglified to protect against interrupts.
+ // Even if a thread has been interrupted when loading resources,
+ // the IO should not abort, so must carefully retry, failing only
+ // if the retry leads to some other IO exception.
+
+ boolean isInterrupted = Thread.interrupted();
+ int len;
+ for (;;) {
+ try {
+ len = getContentLength();
+ break;
+ } catch (InterruptedIOException iioe) {
+ Thread.interrupted();
+ isInterrupted = true;
+ }
+ }
+
+ try {
+ b = new byte[0];
+ if (len == -1) len = Integer.MAX_VALUE;
+ int pos = 0;
+ while (pos < len) {
+ int bytesToRead;
+ if (pos >= b.length) { // Only expand when there's no room
+ bytesToRead = Math.min(len - pos, b.length + 1024);
+ if (b.length < pos + bytesToRead) {
+ b = Arrays.copyOf(b, pos + bytesToRead);
+ }
+ } else {
+ bytesToRead = b.length - pos;
+ }
+ int cc = 0;
+ try {
+ cc = in.read(b, pos, bytesToRead);
+ } catch (InterruptedIOException iioe) {
+ Thread.interrupted();
+ isInterrupted = true;
+ }
+ if (cc < 0) {
+ if (len != Integer.MAX_VALUE) {
+ throw new EOFException("Detect premature EOF");
+ } else {
+ if (b.length != pos) {
+ b = Arrays.copyOf(b, pos);
+ }
+ break;
+ }
+ }
+ pos += cc;
+ }
+ } finally {
+ try {
+ in.close();
+ } catch (InterruptedIOException iioe) {
+ isInterrupted = true;
+ } catch (IOException ignore) {}
+
+ if (isInterrupted) {
+ Thread.currentThread().interrupt();
+ }
+ }
+ return b;
+ }
+
+ /**
+ * Returns the Resource data as a ByteBuffer, but only if the input stream
+ * was implemented on top of a ByteBuffer. Return {@code null} otherwise.
+ * @return Resource data or null.
+ */
+ public ByteBuffer getByteBuffer() throws IOException {
+ InputStream in = cachedInputStream();
+ if (in instanceof ByteBuffered) {
+ return ((ByteBuffered)in).getByteBuffer();
+ }
+ return null;
+ }
+
+ /**
+ * Returns the Manifest for the Resource, or null if none.
+ */
+ public Manifest getManifest() throws IOException {
+ return null;
+ }
+
+ /**
+ * Returns theCertificates for the Resource, or null if none.
+ */
+ public java.security.cert.Certificate[] getCertificates() {
+ return null;
+ }
+
+ /**
+ * Returns the code signers for the Resource, or null if none.
+ */
+ public CodeSigner[] getCodeSigners() {
+ return null;
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/java.base/share/classes/jdk/internal/loader/URLClassPath.java Tue Mar 29 13:43:29 2016 +0200
@@ -0,0 +1,1052 @@
+/*
+ * Copyright (c) 1997, 2013, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.internal.loader;
+
+import java.io.Closeable;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.HttpURLConnection;
+import java.net.JarURLConnection;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLConnection;
+import java.net.URLStreamHandler;
+import java.net.URLStreamHandlerFactory;
+import java.security.AccessControlException;
+import java.security.AccessController;
+import java.security.CodeSigner;
+import java.security.Permission;
+import java.security.PrivilegedExceptionAction;
+import java.security.cert.Certificate;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.NoSuchElementException;
+import java.util.Set;
+import java.util.Stack;
+import java.util.StringTokenizer;
+import java.util.jar.JarFile;
+import java.util.zip.ZipEntry;
+import java.util.jar.JarEntry;
+import java.util.jar.Manifest;
+import java.util.jar.Attributes;
+import java.util.jar.Attributes.Name;
+import java.util.zip.ZipFile;
+
+import jdk.internal.misc.JavaUtilZipFileAccess;
+import jdk.internal.misc.SharedSecrets;
+import sun.misc.InvalidJarIndexException;
+import sun.misc.JarIndex;
+import sun.net.util.URLUtil;
+import sun.net.www.ParseUtil;
+
+/**
+ * This class is used to maintain a search path of URLs for loading classes
+ * and resources from both JAR files and directories.
+ *
+ * @author David Connelly
+ */
+public class URLClassPath {
+ private static final String USER_AGENT_JAVA_VERSION = "UA-Java-Version";
+ private static final String JAVA_HOME;
+ private static final String JAVA_VERSION;
+ private static final boolean DEBUG;
+ private static final boolean DISABLE_JAR_CHECKING;
+
+ static {
+ JAVA_HOME = java.security.AccessController.doPrivileged(
+ new sun.security.action.GetPropertyAction("java.home"));
+ JAVA_VERSION = java.security.AccessController.doPrivileged(
+ new sun.security.action.GetPropertyAction("java.version"));
+ DEBUG = (java.security.AccessController.doPrivileged(
+ new sun.security.action.GetPropertyAction("sun.misc.URLClassPath.debug")) != null);
+ String p = java.security.AccessController.doPrivileged(
+ new sun.security.action.GetPropertyAction("sun.misc.URLClassPath.disableJarChecking"));
+ DISABLE_JAR_CHECKING = p != null ? p.equals("true") || p.equals("") : false;
+ }
+
+ /* The original search path of URLs. */
+ private ArrayList<URL> path = new ArrayList<>();
+
+ /* The stack of unopened URLs */
+ Stack<URL> urls = new Stack<>();
+
+ /* The resulting search path of Loaders */
+ ArrayList<Loader> loaders = new ArrayList<>();
+
+ /* Map of each URL opened to its corresponding Loader */
+ HashMap<String, Loader> lmap = new HashMap<>();
+
+ /* The jar protocol handler to use when creating new URLs */
+ private URLStreamHandler jarHandler;
+
+ /* Whether this URLClassLoader has been closed yet */
+ private boolean closed = false;
+
+ /**
+ * Creates a new URLClassPath for the given URLs. The URLs will be
+ * searched in the order specified for classes and resources. A URL
+ * ending with a '/' is assumed to refer to a directory. Otherwise,
+ * the URL is assumed to refer to a JAR file.
+ *
+ * @param urls the directory and JAR file URLs to search for classes
+ * and resources
+ * @param factory the URLStreamHandlerFactory to use when creating new URLs
+ */
+ public URLClassPath(URL[] urls, URLStreamHandlerFactory factory) {
+ for (int i = 0; i < urls.length; i++) {
+ path.add(urls[i]);
+ }
+ push(urls);
+ if (factory != null) {
+ jarHandler = factory.createURLStreamHandler("jar");
+ }
+ }
+
+ public URLClassPath(URL[] urls) {
+ this(urls, null);
+ }
+
+ public synchronized List<IOException> closeLoaders() {
+ if (closed) {
+ return Collections.emptyList();
+ }
+ List<IOException> result = new LinkedList<>();
+ for (Loader loader : loaders) {
+ try {
+ loader.close();
+ } catch (IOException e) {
+ result.add (e);
+ }
+ }
+ closed = true;
+ return result;
+ }
+
+ /**
+ * Appends the specified URL to the search path of directory and JAR
+ * file URLs from which to load classes and resources.
+ * <p>
+ * If the URL specified is null or is already in the list of
+ * URLs, then invoking this method has no effect.
+ */
+ public synchronized void addURL(URL url) {
+ if (closed)
+ return;
+ synchronized (urls) {
+ if (url == null || path.contains(url))
+ return;
+
+ urls.add(0, url);
+ path.add(url);
+ }
+ }
+
+ /**
+ * Returns the original search path of URLs.
+ */
+ public URL[] getURLs() {
+ synchronized (urls) {
+ return path.toArray(new URL[path.size()]);
+ }
+ }
+
+ /**
+ * Finds the resource with the specified name on the URL search path
+ * or null if not found or security check fails.
+ *
+ * @param name the name of the resource
+ * @param check whether to perform a security check
+ * @return a <code>URL</code> for the resource, or <code>null</code>
+ * if the resource could not be found.
+ */
+ public URL findResource(String name, boolean check) {
+ Loader loader;
+ for (int i = 0; (loader = getLoader(i)) != null; i++) {
+ URL url = loader.findResource(name, check);
+ if (url != null) {
+ return url;
+ }
+ }
+ return null;
+ }
+
+ /**
+ * Finds the first Resource on the URL search path which has the specified
+ * name. Returns null if no Resource could be found.
+ *
+ * @param name the name of the Resource
+ * @param check whether to perform a security check
+ * @return the Resource, or null if not found
+ */
+ public Resource getResource(String name, boolean check) {
+ if (DEBUG) {
+ System.err.println("URLClassPath.getResource(\"" + name + "\")");
+ }
+
+ Loader loader;
+ for (int i = 0; (loader = getLoader(i)) != null; i++) {
+ Resource res = loader.getResource(name, check);
+ if (res != null) {
+ return res;
+ }
+ }
+ return null;
+ }
+
+ /**
+ * Finds all resources on the URL search path with the given name.
+ * Returns an enumeration of the URL objects.
+ *
+ * @param name the resource name
+ * @return an Enumeration of all the urls having the specified name
+ */
+ public Enumeration<URL> findResources(final String name,
+ final boolean check) {
+ return new Enumeration<>() {
+ private int index = 0;
+ private URL url = null;
+
+ private boolean next() {
+ if (url != null) {
+ return true;
+ } else {
+ Loader loader;
+ while ((loader = getLoader(index++)) != null) {
+ url = loader.findResource(name, check);
+ if (url != null) {
+ return true;
+ }
+ }
+ return false;
+ }
+ }
+
+ public boolean hasMoreElements() {
+ return next();
+ }
+
+ public URL nextElement() {
+ if (!next()) {
+ throw new NoSuchElementException();
+ }
+ URL u = url;
+ url = null;
+ return u;
+ }
+ };
+ }
+
+ public Resource getResource(String name) {
+ return getResource(name, true);
+ }
+
+ /**
+ * Finds all resources on the URL search path with the given name.
+ * Returns an enumeration of the Resource objects.
+ *
+ * @param name the resource name
+ * @return an Enumeration of all the resources having the specified name
+ */
+ public Enumeration<Resource> getResources(final String name,
+ final boolean check) {
+ return new Enumeration<>() {
+ private int index = 0;
+ private Resource res = null;
+
+ private boolean next() {
+ if (res != null) {
+ return true;
+ } else {
+ Loader loader;
+ while ((loader = getLoader(index++)) != null) {
+ res = loader.getResource(name, check);
+ if (res != null) {
+ return true;
+ }
+ }
+ return false;
+ }
+ }
+
+ public boolean hasMoreElements() {
+ return next();
+ }
+
+ public Resource nextElement() {
+ if (!next()) {
+ throw new NoSuchElementException();
+ }
+ Resource r = res;
+ res = null;
+ return r;
+ }
+ };
+ }
+
+ public Enumeration<Resource> getResources(final String name) {
+ return getResources(name, true);
+ }
+
+ /*
+ * Returns the Loader at the specified position in the URL search
+ * path. The URLs are opened and expanded as needed. Returns null
+ * if the specified index is out of range.
+ */
+ private synchronized Loader getLoader(int index) {
+ if (closed) {
+ return null;
+ }
+ // Expand URL search path until the request can be satisfied
+ // or the URL stack is empty.
+ while (loaders.size() < index + 1) {
+ // Pop the next URL from the URL stack
+ URL url;
+ synchronized (urls) {
+ if (urls.empty()) {
+ return null;
+ } else {
+ url = urls.pop();
+ }
+ }
+ // Skip this URL if it already has a Loader. (Loader
+ // may be null in the case where URL has not been opened
+ // but is referenced by a JAR index.)
+ String urlNoFragString = URLUtil.urlNoFragString(url);
+ if (lmap.containsKey(urlNoFragString)) {
+ continue;
+ }
+ // Otherwise, create a new Loader for the URL.
+ Loader loader;
+ try {
+ loader = getLoader(url);
+ // If the loader defines a local class path then add the
+ // URLs to the list of URLs to be opened.
+ URL[] urls = loader.getClassPath();
+ if (urls != null) {
+ push(urls);
+ }
+ } catch (IOException e) {
+ // Silently ignore for now...
+ continue;
+ }
+ // Finally, add the Loader to the search path.
+ loaders.add(loader);
+ lmap.put(urlNoFragString, loader);
+ }
+ return loaders.get(index);
+ }
+
+ /*
+ * Returns the Loader for the specified base URL.
+ */
+ private Loader getLoader(final URL url) throws IOException {
+ try {
+ return java.security.AccessController.doPrivileged(
+ new java.security.PrivilegedExceptionAction<>() {
+ public Loader run() throws IOException {
+ String file = url.getFile();
+ if (file != null && file.endsWith("/")) {
+ if ("file".equals(url.getProtocol())) {
+ return new FileLoader(url);
+ } else {
+ return new Loader(url);
+ }
+ } else {
+ return new JarLoader(url, jarHandler, lmap);
+ }
+ }
+ });
+ } catch (java.security.PrivilegedActionException pae) {
+ throw (IOException)pae.getException();
+ }
+ }
+
+ /*
+ * Pushes the specified URLs onto the list of unopened URLs.
+ */
+ private void push(URL[] us) {
+ synchronized (urls) {
+ for (int i = us.length - 1; i >= 0; --i) {
+ urls.push(us[i]);
+ }
+ }
+ }
+
+ /*
+ * Check whether the resource URL should be returned.
+ * Return null on security check failure.
+ * Called by java.net.URLClassLoader.
+ */
+ public static URL checkURL(URL url) {
+ if (url != null) {
+ try {
+ check(url);
+ } catch (Exception e) {
+ return null;
+ }
+ }
+ return url;
+ }
+
+ /*
+ * Check whether the resource URL should be returned.
+ * Throw exception on failure.
+ * Called internally within this file.
+ */
+ public static void check(URL url) throws IOException {
+ SecurityManager security = System.getSecurityManager();
+ if (security != null) {
+ URLConnection urlConnection = url.openConnection();
+ Permission perm = urlConnection.getPermission();
+ if (perm != null) {
+ try {
+ security.checkPermission(perm);
+ } catch (SecurityException se) {
+ // fallback to checkRead/checkConnect for pre 1.2
+ // security managers
+ if ((perm instanceof java.io.FilePermission) &&
+ perm.getActions().indexOf("read") != -1) {
+ security.checkRead(perm.getName());
+ } else if ((perm instanceof
+ java.net.SocketPermission) &&
+ perm.getActions().indexOf("connect") != -1) {
+ URL locUrl = url;
+ if (urlConnection instanceof JarURLConnection) {
+ locUrl = ((JarURLConnection)urlConnection).getJarFileURL();
+ }
+ security.checkConnect(locUrl.getHost(),
+ locUrl.getPort());
+ } else {
+ throw se;
+ }
+ }
+ }
+ }
+ }
+
+ /**
+ * Inner class used to represent a loader of resources and classes
+ * from a base URL.
+ */
+ private static class Loader implements Closeable {
+ private final URL base;
+ private JarFile jarfile; // if this points to a jar file
+
+ /*
+ * Creates a new Loader for the specified URL.
+ */
+ Loader(URL url) {
+ base = url;
+ }
+
+ /*
+ * Returns the base URL for this Loader.
+ */
+ URL getBaseURL() {
+ return base;
+ }
+
+ URL findResource(final String name, boolean check) {
+ URL url;
+ try {
+ url = new URL(base, ParseUtil.encodePath(name, false));
+ } catch (MalformedURLException e) {
+ throw new IllegalArgumentException("name");
+ }
+
+ try {
+ if (check) {
+ URLClassPath.check(url);
+ }
+
+ /*
+ * For a HTTP connection we use the HEAD method to
+ * check if the resource exists.
+ */
+ URLConnection uc = url.openConnection();
+ if (uc instanceof HttpURLConnection) {
+ HttpURLConnection hconn = (HttpURLConnection)uc;
+ hconn.setRequestMethod("HEAD");
+ if (hconn.getResponseCode() >= HttpURLConnection.HTTP_BAD_REQUEST) {
+ return null;
+ }
+ } else {
+ // our best guess for the other cases
+ uc.setUseCaches(false);
+ InputStream is = uc.getInputStream();
+ is.close();
+ }
+ return url;
+ } catch (Exception e) {
+ return null;
+ }
+ }
+
+ Resource getResource(final String name, boolean check) {
+ final URL url;
+ try {
+ url = new URL(base, ParseUtil.encodePath(name, false));
+ } catch (MalformedURLException e) {
+ throw new IllegalArgumentException("name");
+ }
+ final URLConnection uc;
+ try {
+ if (check) {
+ URLClassPath.check(url);
+ }
+ uc = url.openConnection();
+ InputStream in = uc.getInputStream();
+ if (uc instanceof JarURLConnection) {
+ /* Need to remember the jar file so it can be closed
+ * in a hurry.
+ */
+ JarURLConnection juc = (JarURLConnection)uc;
+ jarfile = JarLoader.checkJar(juc.getJarFile());
+ }
+ } catch (Exception e) {
+ return null;
+ }
+ return new Resource() {
+ public String getName() { return name; }
+ public URL getURL() { return url; }
+ public URL getCodeSourceURL() { return base; }
+ public InputStream getInputStream() throws IOException {
+ return uc.getInputStream();
+ }
+ public int getContentLength() throws IOException {
+ return uc.getContentLength();
+ }
+ };
+ }
+
+ /*
+ * Returns the Resource for the specified name, or null if not
+ * found or the caller does not have the permission to get the
+ * resource.
+ */
+ Resource getResource(final String name) {
+ return getResource(name, true);
+ }
+
+ /*
+ * close this loader and release all resources
+ * method overridden in sub-classes
+ */
+ public void close () throws IOException {
+ if (jarfile != null) {
+ jarfile.close();
+ }
+ }
+
+ /*
+ * Returns the local class path for this loader, or null if none.
+ */
+ URL[] getClassPath() throws IOException {
+ return null;
+ }
+ }
+
+ /*
+ * Inner class used to represent a Loader of resources from a JAR URL.
+ */
+ static class JarLoader extends Loader {
+ private JarFile jar;
+ private URL csu;
+ private JarIndex index;
+ private URLStreamHandler handler;
+ private HashMap<String, Loader> lmap;
+ private boolean closed = false;
+ private static final JavaUtilZipFileAccess zipAccess =
+ SharedSecrets.getJavaUtilZipFileAccess();
+
+ /*
+ * Creates a new JarLoader for the specified URL referring to
+ * a JAR file.
+ */
+ JarLoader(URL url, URLStreamHandler jarHandler,
+ HashMap<String, Loader> loaderMap)
+ throws IOException
+ {
+ super(new URL("jar", "", -1, url + "!/", jarHandler));
+ csu = url;
+ handler = jarHandler;
+ lmap = loaderMap;
+
+ ensureOpen();
+ }
+
+ @Override
+ public void close () throws IOException {
+ // closing is synchronized at higher level
+ if (!closed) {
+ closed = true;
+ // in case not already open.
+ ensureOpen();
+ jar.close();
+ }
+ }
+
+ JarFile getJarFile () {
+ return jar;
+ }
+
+ private boolean isOptimizable(URL url) {
+ return "file".equals(url.getProtocol());
+ }
+
+ private void ensureOpen() throws IOException {
+ if (jar == null) {
+ try {
+ java.security.AccessController.doPrivileged(
+ new java.security.PrivilegedExceptionAction<>() {
+ public Void run() throws IOException {
+ if (DEBUG) {
+ System.err.println("Opening " + csu);
+ Thread.dumpStack();
+ }
+
+ jar = getJarFile(csu);
+ index = JarIndex.getJarIndex(jar);
+ if (index != null) {
+ String[] jarfiles = index.getJarFiles();
+ // Add all the dependent URLs to the lmap so that loaders
+ // will not be created for them by URLClassPath.getLoader(int)
+ // if the same URL occurs later on the main class path. We set
+ // Loader to null here to avoid creating a Loader for each
+ // URL until we actually need to try to load something from them.
+ for(int i = 0; i < jarfiles.length; i++) {
+ try {
+ URL jarURL = new URL(csu, jarfiles[i]);
+ // If a non-null loader already exists, leave it alone.
+ String urlNoFragString = URLUtil.urlNoFragString(jarURL);
+ if (!lmap.containsKey(urlNoFragString)) {
+ lmap.put(urlNoFragString, null);
+ }
+ } catch (MalformedURLException e) {
+ continue;
+ }
+ }
+ }
+ return null;
+ }
+ }
+ );
+ } catch (java.security.PrivilegedActionException pae) {
+ throw (IOException)pae.getException();
+ }
+ }
+ }
+
+ /* Throws if the given jar file is does not start with the correct LOC */
+ static JarFile checkJar(JarFile jar) throws IOException {
+ if (System.getSecurityManager() != null && !DISABLE_JAR_CHECKING
+ && !zipAccess.startsWithLocHeader(jar)) {
+ IOException x = new IOException("Invalid Jar file");
+ try {
+ jar.close();
+ } catch (IOException ex) {
+ x.addSuppressed(ex);
+ }
+ throw x;
+ }
+
+ return jar;
+ }
+
+ private JarFile getJarFile(URL url) throws IOException {
+ // Optimize case where url refers to a local jar file
+ if (isOptimizable(url)) {
+ FileURLMapper p = new FileURLMapper (url);
+ if (!p.exists()) {
+ throw new FileNotFoundException(p.getPath());
+ }
+ return checkJar(new JarFile(new File(p.getPath()), true, ZipFile.OPEN_READ,
+ JarFile.Release.RUNTIME));
+ }
+ URLConnection uc = (new URL(getBaseURL(), "#runtime")).openConnection();
+ uc.setRequestProperty(USER_AGENT_JAVA_VERSION, JAVA_VERSION);
+ JarFile jarFile = ((JarURLConnection)uc).getJarFile();
+ return checkJar(jarFile);
+ }
+
+ /*
+ * Returns the index of this JarLoader if it exists.
+ */
+ JarIndex getIndex() {
+ try {
+ ensureOpen();
+ } catch (IOException e) {
+ throw new InternalError(e);
+ }
+ return index;
+ }
+
+ /*
+ * Creates the resource and if the check flag is set to true, checks if
+ * is its okay to return the resource.
+ */
+ Resource checkResource(final String name, boolean check,
+ final JarEntry entry) {
+
+ final URL url;
+ try {
+ if (jar.isMultiRelease()) {
+ // add #runtime fragment to tell JarURLConnection to use
+ // runtime versioning if the underlying jar file is multi-release
+ url = new URL(getBaseURL(), ParseUtil.encodePath(name, false) + "#runtime");
+ } else {
+ url = new URL(getBaseURL(), ParseUtil.encodePath(name, false));
+ }
+ if (check) {
+ URLClassPath.check(url);
+ }
+ } catch (MalformedURLException e) {
+ return null;
+ // throw new IllegalArgumentException("name");
+ } catch (IOException e) {
+ return null;
+ } catch (AccessControlException e) {
+ return null;
+ }
+
+ return new Resource() {
+ public String getName() { return name; }
+ public URL getURL() { return url; }
+ public URL getCodeSourceURL() { return csu; }
+ public InputStream getInputStream() throws IOException
+ { return jar.getInputStream(entry); }
+ public int getContentLength()
+ { return (int)entry.getSize(); }
+ public Manifest getManifest() throws IOException
+ { return jar.getManifest(); };
+ public Certificate[] getCertificates()
+ { return entry.getCertificates(); };
+ public CodeSigner[] getCodeSigners()
+ { return entry.getCodeSigners(); };
+ };
+ }
+
+
+ /*
+ * Returns true iff atleast one resource in the jar file has the same
+ * package name as that of the specified resource name.
+ */
+ boolean validIndex(final String name) {
+ String packageName = name;
+ int pos;
+ if((pos = name.lastIndexOf('/')) != -1) {
+ packageName = name.substring(0, pos);
+ }
+
+ String entryName;
+ ZipEntry entry;
+ Enumeration<JarEntry> enum_ = jar.entries();
+ while (enum_.hasMoreElements()) {
+ entry = enum_.nextElement();
+ entryName = entry.getName();
+ if((pos = entryName.lastIndexOf('/')) != -1)
+ entryName = entryName.substring(0, pos);
+ if (entryName.equals(packageName)) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ /*
+ * Returns the URL for a resource with the specified name
+ */
+ URL findResource(final String name, boolean check) {
+ Resource rsc = getResource(name, check);
+ if (rsc != null) {
+ return rsc.getURL();
+ }
+ return null;
+ }
+
+ /*
+ * Returns the JAR Resource for the specified name.
+ */
+ Resource getResource(final String name, boolean check) {
+ try {
+ ensureOpen();
+ } catch (IOException e) {
+ throw new InternalError(e);
+ }
+ final JarEntry entry = jar.getJarEntry(name);
+ if (entry != null)
+ return checkResource(name, check, entry);
+
+ if (index == null)
+ return null;
+
+ HashSet<String> visited = new HashSet<>();
+ return getResource(name, check, visited);
+ }
+
+ /*
+ * Version of getResource() that tracks the jar files that have been
+ * visited by linking through the index files. This helper method uses
+ * a HashSet to store the URLs of jar files that have been searched and
+ * uses it to avoid going into an infinite loop, looking for a
+ * non-existent resource
+ */
+ Resource getResource(final String name, boolean check,
+ Set<String> visited) {
+
+ Resource res;
+ String[] jarFiles;
+ int count = 0;
+ LinkedList<String> jarFilesList = null;
+
+ /* If there no jar files in the index that can potential contain
+ * this resource then return immediately.
+ */
+ if((jarFilesList = index.get(name)) == null)
+ return null;
+
+ do {
+ int size = jarFilesList.size();
+ jarFiles = jarFilesList.toArray(new String[size]);
+ /* loop through the mapped jar file list */
+ while(count < size) {
+ String jarName = jarFiles[count++];
+ JarLoader newLoader;
+ final URL url;
+
+ try{
+ url = new URL(csu, jarName);
+ String urlNoFragString = URLUtil.urlNoFragString(url);
+ if ((newLoader = (JarLoader)lmap.get(urlNoFragString)) == null) {
+ /* no loader has been set up for this jar file
+ * before
+ */
+ newLoader = AccessController.doPrivileged(
+ new PrivilegedExceptionAction<>() {
+ public JarLoader run() throws IOException {
+ return new JarLoader(url, handler,
+ lmap);
+ }
+ });
+
+ /* this newly opened jar file has its own index,
+ * merge it into the parent's index, taking into
+ * account the relative path.
+ */
+ JarIndex newIndex = newLoader.getIndex();
+ if(newIndex != null) {
+ int pos = jarName.lastIndexOf('/');
+ newIndex.merge(this.index, (pos == -1 ?
+ null : jarName.substring(0, pos + 1)));
+ }
+
+ /* put it in the global hashtable */
+ lmap.put(urlNoFragString, newLoader);
+ }
+ } catch (java.security.PrivilegedActionException pae) {
+ continue;
+ } catch (MalformedURLException e) {
+ continue;
+ }
+
+
+ /* Note that the addition of the url to the list of visited
+ * jars incorporates a check for presence in the hashmap
+ */
+ boolean visitedURL = !visited.add(URLUtil.urlNoFragString(url));
+ if (!visitedURL) {
+ try {
+ newLoader.ensureOpen();
+ } catch (IOException e) {
+ throw new InternalError(e);
+ }
+ final JarEntry entry = newLoader.jar.getJarEntry(name);
+ if (entry != null) {
+ return newLoader.checkResource(name, check, entry);
+ }
+
+ /* Verify that at least one other resource with the
+ * same package name as the lookedup resource is
+ * present in the new jar
+ */
+ if (!newLoader.validIndex(name)) {
+ /* the mapping is wrong */
+ throw new InvalidJarIndexException("Invalid index");
+ }
+ }
+
+ /* If newLoader is the current loader or if it is a
+ * loader that has already been searched or if the new
+ * loader does not have an index then skip it
+ * and move on to the next loader.
+ */
+ if (visitedURL || newLoader == this ||
+ newLoader.getIndex() == null) {
+ continue;
+ }
+
+ /* Process the index of the new loader
+ */
+ if((res = newLoader.getResource(name, check, visited))
+ != null) {
+ return res;
+ }
+ }
+ // Get the list of jar files again as the list could have grown
+ // due to merging of index files.
+ jarFilesList = index.get(name);
+
+ // If the count is unchanged, we are done.
+ } while(count < jarFilesList.size());
+ return null;
+ }
+
+
+ /*
+ * Returns the JAR file local class path, or null if none.
+ */
+ URL[] getClassPath() throws IOException {
+ if (index != null) {
+ return null;
+ }
+
+ ensureOpen();
+
+ if (SharedSecrets.javaUtilJarAccess().jarFileHasClassPathAttribute(jar)) { // Only get manifest when necessary
+ Manifest man = jar.getManifest();
+ if (man != null) {
+ Attributes attr = man.getMainAttributes();
+ if (attr != null) {
+ String value = attr.getValue(Name.CLASS_PATH);
+ if (value != null) {
+ return parseClassPath(csu, value);
+ }
+ }
+ }
+ }
+ return null;
+ }
+
+ /*
+ * Parses value of the Class-Path manifest attribute and returns
+ * an array of URLs relative to the specified base URL.
+ */
+ private URL[] parseClassPath(URL base, String value)
+ throws MalformedURLException
+ {
+ StringTokenizer st = new StringTokenizer(value);
+ URL[] urls = new URL[st.countTokens()];
+ int i = 0;
+ while (st.hasMoreTokens()) {
+ String path = st.nextToken();
+ urls[i] = new URL(base, path);
+ i++;
+ }
+ return urls;
+ }
+ }
+
+ /*
+ * Inner class used to represent a loader of classes and resources
+ * from a file URL that refers to a directory.
+ */
+ private static class FileLoader extends Loader {
+ /* Canonicalized File */
+ private File dir;
+
+ FileLoader(URL url) throws IOException {
+ super(url);
+ if (!"file".equals(url.getProtocol())) {
+ throw new IllegalArgumentException("url");
+ }
+ String path = url.getFile().replace('/', File.separatorChar);
+ path = ParseUtil.decode(path);
+ dir = (new File(path)).getCanonicalFile();
+ }
+
+ /*
+ * Returns the URL for a resource with the specified name
+ */
+ URL findResource(final String name, boolean check) {
+ Resource rsc = getResource(name, check);
+ if (rsc != null) {
+ return rsc.getURL();
+ }
+ return null;
+ }
+
+ Resource getResource(final String name, boolean check) {
+ final URL url;
+ try {
+ URL normalizedBase = new URL(getBaseURL(), ".");
+ url = new URL(getBaseURL(), ParseUtil.encodePath(name, false));
+
+ if (url.getFile().startsWith(normalizedBase.getFile()) == false) {
+ // requested resource had ../..'s in path
+ return null;
+ }
+
+ if (check)
+ URLClassPath.check(url);
+
+ final File file;
+ if (name.indexOf("..") != -1) {
+ file = (new File(dir, name.replace('/', File.separatorChar)))
+ .getCanonicalFile();
+ if ( !((file.getPath()).startsWith(dir.getPath())) ) {
+ /* outside of base dir */
+ return null;
+ }
+ } else {
+ file = new File(dir, name.replace('/', File.separatorChar));
+ }
+
+ if (file.exists()) {
+ return new Resource() {
+ public String getName() { return name; };
+ public URL getURL() { return url; };
+ public URL getCodeSourceURL() { return getBaseURL(); };
+ public InputStream getInputStream() throws IOException
+ { return new FileInputStream(file); };
+ public int getContentLength() throws IOException
+ { return (int)file.length(); };
+ };
+ }
+ } catch (Exception e) {
+ return null;
+ }
+ return null;
+ }
+ }
+}
--- a/jdk/src/java.base/share/classes/jdk/internal/misc/JavaNetAccess.java Fri Mar 25 15:35:43 2016 +0300
+++ b/jdk/src/java.base/share/classes/jdk/internal/misc/JavaNetAccess.java Tue Mar 29 13:43:29 2016 +0200
@@ -26,7 +26,7 @@
package jdk.internal.misc;
import java.net.URLClassLoader;
-import sun.misc.URLClassPath;
+import jdk.internal.loader.URLClassPath;
public interface JavaNetAccess {
/**
--- a/jdk/src/java.base/share/classes/jdk/internal/module/ModulePatcher.java Fri Mar 25 15:35:43 2016 +0300
+++ b/jdk/src/java.base/share/classes/jdk/internal/module/ModulePatcher.java Tue Mar 29 13:43:29 2016 +0200
@@ -51,9 +51,9 @@
import java.util.jar.JarEntry;
import java.util.jar.JarFile;
+import jdk.internal.loader.Resource;
import jdk.internal.misc.JavaLangModuleAccess;
import jdk.internal.misc.SharedSecrets;
-import sun.misc.Resource;
import sun.net.www.ParseUtil;
@@ -583,4 +583,4 @@
throw new IllegalArgumentException(msg);
}
-}
\ No newline at end of file
+}
--- a/jdk/src/java.base/share/classes/module-info.java Fri Mar 25 15:35:43 2016 +0300
+++ b/jdk/src/java.base/share/classes/module-info.java Tue Mar 29 13:43:29 2016 +0200
@@ -274,7 +274,6 @@
jdk.localedata;
exports sun.util.logging to
java.desktop,
- java.httpclient,
java.logging,
java.prefs;
--- a/jdk/src/java.base/share/classes/sun/misc/Resource.java Fri Mar 25 15:35:43 2016 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,188 +0,0 @@
-/*
- * Copyright (c) 1998, 2009, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.misc;
-
-import java.io.EOFException;
-import java.net.URL;
-import java.io.IOException;
-import java.io.InterruptedIOException;
-import java.io.InputStream;
-import java.security.CodeSigner;
-import java.util.jar.Manifest;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import sun.nio.ByteBuffered;
-
-/**
- * This class is used to represent a Resource that has been loaded
- * from the class path.
- *
- * @author David Connelly
- * @since 1.2
- */
-public abstract class Resource {
- /**
- * Returns the name of the Resource.
- */
- public abstract String getName();
-
- /**
- * Returns the URL of the Resource.
- */
- public abstract URL getURL();
-
- /**
- * Returns the CodeSource URL for the Resource.
- */
- public abstract URL getCodeSourceURL();
-
- /**
- * Returns an InputStream for reading the Resource data.
- */
- public abstract InputStream getInputStream() throws IOException;
-
- /**
- * Returns the length of the Resource data, or -1 if unknown.
- */
- public abstract int getContentLength() throws IOException;
-
- private InputStream cis;
-
- /* Cache result in case getBytes is called after getByteBuffer. */
- private synchronized InputStream cachedInputStream() throws IOException {
- if (cis == null) {
- cis = getInputStream();
- }
- return cis;
- }
-
- /**
- * Returns the Resource data as an array of bytes.
- */
- public byte[] getBytes() throws IOException {
- byte[] b;
- // Get stream before content length so that a FileNotFoundException
- // can propagate upwards without being caught too early
- InputStream in = cachedInputStream();
-
- // This code has been uglified to protect against interrupts.
- // Even if a thread has been interrupted when loading resources,
- // the IO should not abort, so must carefully retry, failing only
- // if the retry leads to some other IO exception.
-
- boolean isInterrupted = Thread.interrupted();
- int len;
- for (;;) {
- try {
- len = getContentLength();
- break;
- } catch (InterruptedIOException iioe) {
- Thread.interrupted();
- isInterrupted = true;
- }
- }
-
- try {
- b = new byte[0];
- if (len == -1) len = Integer.MAX_VALUE;
- int pos = 0;
- while (pos < len) {
- int bytesToRead;
- if (pos >= b.length) { // Only expand when there's no room
- bytesToRead = Math.min(len - pos, b.length + 1024);
- if (b.length < pos + bytesToRead) {
- b = Arrays.copyOf(b, pos + bytesToRead);
- }
- } else {
- bytesToRead = b.length - pos;
- }
- int cc = 0;
- try {
- cc = in.read(b, pos, bytesToRead);
- } catch (InterruptedIOException iioe) {
- Thread.interrupted();
- isInterrupted = true;
- }
- if (cc < 0) {
- if (len != Integer.MAX_VALUE) {
- throw new EOFException("Detect premature EOF");
- } else {
- if (b.length != pos) {
- b = Arrays.copyOf(b, pos);
- }
- break;
- }
- }
- pos += cc;
- }
- } finally {
- try {
- in.close();
- } catch (InterruptedIOException iioe) {
- isInterrupted = true;
- } catch (IOException ignore) {}
-
- if (isInterrupted) {
- Thread.currentThread().interrupt();
- }
- }
- return b;
- }
-
- /**
- * Returns the Resource data as a ByteBuffer, but only if the input stream
- * was implemented on top of a ByteBuffer. Return {@code null} otherwise.
- * @return Resource data or null.
- */
- public ByteBuffer getByteBuffer() throws IOException {
- InputStream in = cachedInputStream();
- if (in instanceof ByteBuffered) {
- return ((ByteBuffered)in).getByteBuffer();
- }
- return null;
- }
-
- /**
- * Returns the Manifest for the Resource, or null if none.
- */
- public Manifest getManifest() throws IOException {
- return null;
- }
-
- /**
- * Returns theCertificates for the Resource, or null if none.
- */
- public java.security.cert.Certificate[] getCertificates() {
- return null;
- }
-
- /**
- * Returns the code signers for the Resource, or null if none.
- */
- public CodeSigner[] getCodeSigners() {
- return null;
- }
-}
--- a/jdk/src/java.base/share/classes/sun/misc/URLClassPath.java Fri Mar 25 15:35:43 2016 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1080 +0,0 @@
-/*
- * Copyright (c) 1997, 2013, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.misc;
-
-import java.io.Closeable;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.HttpURLConnection;
-import java.net.JarURLConnection;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLConnection;
-import java.net.URLStreamHandler;
-import java.net.URLStreamHandlerFactory;
-import java.security.AccessControlException;
-import java.security.AccessController;
-import java.security.CodeSigner;
-import java.security.Permission;
-import java.security.PrivilegedExceptionAction;
-import java.security.cert.Certificate;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.NoSuchElementException;
-import java.util.Set;
-import java.util.Stack;
-import java.util.StringTokenizer;
-import java.util.jar.JarFile;
-import java.util.zip.ZipEntry;
-import java.util.jar.JarEntry;
-import java.util.jar.Manifest;
-import java.util.jar.Attributes;
-import java.util.jar.Attributes.Name;
-import java.util.zip.ZipFile;
-
-import jdk.internal.misc.JavaUtilZipFileAccess;
-import jdk.internal.misc.SharedSecrets;
-import sun.net.util.URLUtil;
-import sun.net.www.ParseUtil;
-
-/**
- * This class is used to maintain a search path of URLs for loading classes
- * and resources from both JAR files and directories.
- *
- * @author David Connelly
- */
-public class URLClassPath {
- private static final String USER_AGENT_JAVA_VERSION = "UA-Java-Version";
- private static final String JAVA_HOME;
- private static final String JAVA_VERSION;
- private static final boolean DEBUG;
- private static final boolean DISABLE_JAR_CHECKING;
-
- static {
- JAVA_HOME = java.security.AccessController.doPrivileged(
- new sun.security.action.GetPropertyAction("java.home"));
- JAVA_VERSION = java.security.AccessController.doPrivileged(
- new sun.security.action.GetPropertyAction("java.version"));
- DEBUG = (java.security.AccessController.doPrivileged(
- new sun.security.action.GetPropertyAction("sun.misc.URLClassPath.debug")) != null);
- String p = java.security.AccessController.doPrivileged(
- new sun.security.action.GetPropertyAction("sun.misc.URLClassPath.disableJarChecking"));
- DISABLE_JAR_CHECKING = p != null ? p.equals("true") || p.equals("") : false;
- }
-
- /* The original search path of URLs. */
- private ArrayList<URL> path = new ArrayList<>();
-
- /* The stack of unopened URLs */
- Stack<URL> urls = new Stack<>();
-
- /* The resulting search path of Loaders */
- ArrayList<Loader> loaders = new ArrayList<>();
-
- /* Map of each URL opened to its corresponding Loader */
- HashMap<String, Loader> lmap = new HashMap<>();
-
- /* The jar protocol handler to use when creating new URLs */
- private URLStreamHandler jarHandler;
-
- /* Whether this URLClassLoader has been closed yet */
- private boolean closed = false;
-
- /**
- * Creates a new URLClassPath for the given URLs. The URLs will be
- * searched in the order specified for classes and resources. A URL
- * ending with a '/' is assumed to refer to a directory. Otherwise,
- * the URL is assumed to refer to a JAR file.
- *
- * @param urls the directory and JAR file URLs to search for classes
- * and resources
- * @param factory the URLStreamHandlerFactory to use when creating new URLs
- */
- public URLClassPath(URL[] urls, URLStreamHandlerFactory factory) {
- for (int i = 0; i < urls.length; i++) {
- path.add(urls[i]);
- }
- push(urls);
- if (factory != null) {
- jarHandler = factory.createURLStreamHandler("jar");
- }
- }
-
- public URLClassPath(URL[] urls) {
- this(urls, null);
- }
-
- public synchronized List<IOException> closeLoaders() {
- if (closed) {
- return Collections.emptyList();
- }
- List<IOException> result = new LinkedList<>();
- for (Loader loader : loaders) {
- try {
- loader.close();
- } catch (IOException e) {
- result.add (e);
- }
- }
- closed = true;
- return result;
- }
-
- /**
- * Appends the specified URL to the search path of directory and JAR
- * file URLs from which to load classes and resources.
- * <p>
- * If the URL specified is null or is already in the list of
- * URLs, then invoking this method has no effect.
- */
- public synchronized void addURL(URL url) {
- if (closed)
- return;
- synchronized (urls) {
- if (url == null || path.contains(url))
- return;
-
- urls.add(0, url);
- path.add(url);
- }
- }
-
- /**
- * Returns the original search path of URLs.
- */
- public URL[] getURLs() {
- synchronized (urls) {
- return path.toArray(new URL[path.size()]);
- }
- }
-
- /**
- * Finds the resource with the specified name on the URL search path
- * or null if not found or security check fails.
- *
- * @param name the name of the resource
- * @param check whether to perform a security check
- * @return a <code>URL</code> for the resource, or <code>null</code>
- * if the resource could not be found.
- */
- public URL findResource(String name, boolean check) {
- Loader loader;
- for (int i = 0; (loader = getLoader(i)) != null; i++) {
- URL url = loader.findResource(name, check);
- if (url != null) {
- return url;
- }
- }
- return null;
- }
-
- /**
- * Finds the first Resource on the URL search path which has the specified
- * name. Returns null if no Resource could be found.
- *
- * @param name the name of the Resource
- * @param check whether to perform a security check
- * @return the Resource, or null if not found
- */
- public Resource getResource(String name, boolean check) {
- if (DEBUG) {
- System.err.println("URLClassPath.getResource(\"" + name + "\")");
- }
-
- Loader loader;
- for (int i = 0; (loader = getLoader(i)) != null; i++) {
- Resource res = loader.getResource(name, check);
- if (res != null) {
- return res;
- }
- }
- return null;
- }
-
- /**
- * Finds all resources on the URL search path with the given name.
- * Returns an enumeration of the URL objects.
- *
- * @param name the resource name
- * @return an Enumeration of all the urls having the specified name
- */
- public Enumeration<URL> findResources(final String name,
- final boolean check) {
- return new Enumeration<>() {
- private int index = 0;
- private URL url = null;
-
- private boolean next() {
- if (url != null) {
- return true;
- } else {
- Loader loader;
- while ((loader = getLoader(index++)) != null) {
- url = loader.findResource(name, check);
- if (url != null) {
- return true;
- }
- }
- return false;
- }
- }
-
- public boolean hasMoreElements() {
- return next();
- }
-
- public URL nextElement() {
- if (!next()) {
- throw new NoSuchElementException();
- }
- URL u = url;
- url = null;
- return u;
- }
- };
- }
-
- public Resource getResource(String name) {
- return getResource(name, true);
- }
-
- /**
- * Finds all resources on the URL search path with the given name.
- * Returns an enumeration of the Resource objects.
- *
- * @param name the resource name
- * @return an Enumeration of all the resources having the specified name
- */
- public Enumeration<Resource> getResources(final String name,
- final boolean check) {
- return new Enumeration<>() {
- private int index = 0;
- private Resource res = null;
-
- private boolean next() {
- if (res != null) {
- return true;
- } else {
- Loader loader;
- while ((loader = getLoader(index++)) != null) {
- res = loader.getResource(name, check);
- if (res != null) {
- return true;
- }
- }
- return false;
- }
- }
-
- public boolean hasMoreElements() {
- return next();
- }
-
- public Resource nextElement() {
- if (!next()) {
- throw new NoSuchElementException();
- }
- Resource r = res;
- res = null;
- return r;
- }
- };
- }
-
- public Enumeration<Resource> getResources(final String name) {
- return getResources(name, true);
- }
-
- /*
- * Returns the Loader at the specified position in the URL search
- * path. The URLs are opened and expanded as needed. Returns null
- * if the specified index is out of range.
- */
- private synchronized Loader getLoader(int index) {
- if (closed) {
- return null;
- }
- // Expand URL search path until the request can be satisfied
- // or the URL stack is empty.
- while (loaders.size() < index + 1) {
- // Pop the next URL from the URL stack
- URL url;
- synchronized (urls) {
- if (urls.empty()) {
- return null;
- } else {
- url = urls.pop();
- }
- }
- // Skip this URL if it already has a Loader. (Loader
- // may be null in the case where URL has not been opened
- // but is referenced by a JAR index.)
- String urlNoFragString = URLUtil.urlNoFragString(url);
- if (lmap.containsKey(urlNoFragString)) {
- continue;
- }
- // Otherwise, create a new Loader for the URL.
- Loader loader;
- try {
- loader = getLoader(url);
- // If the loader defines a local class path then add the
- // URLs to the list of URLs to be opened.
- URL[] urls = loader.getClassPath();
- if (urls != null) {
- push(urls);
- }
- } catch (IOException e) {
- // Silently ignore for now...
- continue;
- }
- // Finally, add the Loader to the search path.
- loaders.add(loader);
- lmap.put(urlNoFragString, loader);
- }
- return loaders.get(index);
- }
-
- /*
- * Returns the Loader for the specified base URL.
- */
- private Loader getLoader(final URL url) throws IOException {
- try {
- return java.security.AccessController.doPrivileged(
- new java.security.PrivilegedExceptionAction<>() {
- public Loader run() throws IOException {
- String file = url.getFile();
- if (file != null && file.endsWith("/")) {
- if ("file".equals(url.getProtocol())) {
- return new FileLoader(url);
- } else {
- return new Loader(url);
- }
- } else {
- return new JarLoader(url, jarHandler, lmap);
- }
- }
- });
- } catch (java.security.PrivilegedActionException pae) {
- throw (IOException)pae.getException();
- }
- }
-
- /*
- * Pushes the specified URLs onto the list of unopened URLs.
- */
- private void push(URL[] us) {
- synchronized (urls) {
- for (int i = us.length - 1; i >= 0; --i) {
- urls.push(us[i]);
- }
- }
- }
-
- /**
- * Convert class path specification into an array of file URLs.
- *
- * The path of the file is encoded before conversion into URL
- * form so that reserved characters can safely appear in the path.
- */
- public static URL[] pathToURLs(String path) {
- StringTokenizer st = new StringTokenizer(path, File.pathSeparator);
- URL[] urls = new URL[st.countTokens()];
- int count = 0;
- while (st.hasMoreTokens()) {
- File f = new File(st.nextToken());
- try {
- f = new File(f.getCanonicalPath());
- } catch (IOException x) {
- // use the non-canonicalized filename
- }
- try {
- urls[count++] = ParseUtil.fileToEncodedURL(f);
- } catch (IOException x) { }
- }
-
- if (urls.length != count) {
- URL[] tmp = new URL[count];
- System.arraycopy(urls, 0, tmp, 0, count);
- urls = tmp;
- }
- return urls;
- }
-
- /*
- * Check whether the resource URL should be returned.
- * Return null on security check failure.
- * Called by java.net.URLClassLoader.
- */
- public static URL checkURL(URL url) {
- if (url != null) {
- try {
- check(url);
- } catch (Exception e) {
- return null;
- }
- }
- return url;
- }
-
- /*
- * Check whether the resource URL should be returned.
- * Throw exception on failure.
- * Called internally within this file.
- */
- public static void check(URL url) throws IOException {
- SecurityManager security = System.getSecurityManager();
- if (security != null) {
- URLConnection urlConnection = url.openConnection();
- Permission perm = urlConnection.getPermission();
- if (perm != null) {
- try {
- security.checkPermission(perm);
- } catch (SecurityException se) {
- // fallback to checkRead/checkConnect for pre 1.2
- // security managers
- if ((perm instanceof java.io.FilePermission) &&
- perm.getActions().indexOf("read") != -1) {
- security.checkRead(perm.getName());
- } else if ((perm instanceof
- java.net.SocketPermission) &&
- perm.getActions().indexOf("connect") != -1) {
- URL locUrl = url;
- if (urlConnection instanceof JarURLConnection) {
- locUrl = ((JarURLConnection)urlConnection).getJarFileURL();
- }
- security.checkConnect(locUrl.getHost(),
- locUrl.getPort());
- } else {
- throw se;
- }
- }
- }
- }
- }
-
- /**
- * Inner class used to represent a loader of resources and classes
- * from a base URL.
- */
- private static class Loader implements Closeable {
- private final URL base;
- private JarFile jarfile; // if this points to a jar file
-
- /*
- * Creates a new Loader for the specified URL.
- */
- Loader(URL url) {
- base = url;
- }
-
- /*
- * Returns the base URL for this Loader.
- */
- URL getBaseURL() {
- return base;
- }
-
- URL findResource(final String name, boolean check) {
- URL url;
- try {
- url = new URL(base, ParseUtil.encodePath(name, false));
- } catch (MalformedURLException e) {
- throw new IllegalArgumentException("name");
- }
-
- try {
- if (check) {
- URLClassPath.check(url);
- }
-
- /*
- * For a HTTP connection we use the HEAD method to
- * check if the resource exists.
- */
- URLConnection uc = url.openConnection();
- if (uc instanceof HttpURLConnection) {
- HttpURLConnection hconn = (HttpURLConnection)uc;
- hconn.setRequestMethod("HEAD");
- if (hconn.getResponseCode() >= HttpURLConnection.HTTP_BAD_REQUEST) {
- return null;
- }
- } else {
- // our best guess for the other cases
- uc.setUseCaches(false);
- InputStream is = uc.getInputStream();
- is.close();
- }
- return url;
- } catch (Exception e) {
- return null;
- }
- }
-
- Resource getResource(final String name, boolean check) {
- final URL url;
- try {
- url = new URL(base, ParseUtil.encodePath(name, false));
- } catch (MalformedURLException e) {
- throw new IllegalArgumentException("name");
- }
- final URLConnection uc;
- try {
- if (check) {
- URLClassPath.check(url);
- }
- uc = url.openConnection();
- InputStream in = uc.getInputStream();
- if (uc instanceof JarURLConnection) {
- /* Need to remember the jar file so it can be closed
- * in a hurry.
- */
- JarURLConnection juc = (JarURLConnection)uc;
- jarfile = JarLoader.checkJar(juc.getJarFile());
- }
- } catch (Exception e) {
- return null;
- }
- return new Resource() {
- public String getName() { return name; }
- public URL getURL() { return url; }
- public URL getCodeSourceURL() { return base; }
- public InputStream getInputStream() throws IOException {
- return uc.getInputStream();
- }
- public int getContentLength() throws IOException {
- return uc.getContentLength();
- }
- };
- }
-
- /*
- * Returns the Resource for the specified name, or null if not
- * found or the caller does not have the permission to get the
- * resource.
- */
- Resource getResource(final String name) {
- return getResource(name, true);
- }
-
- /*
- * close this loader and release all resources
- * method overridden in sub-classes
- */
- public void close () throws IOException {
- if (jarfile != null) {
- jarfile.close();
- }
- }
-
- /*
- * Returns the local class path for this loader, or null if none.
- */
- URL[] getClassPath() throws IOException {
- return null;
- }
- }
-
- /*
- * Inner class used to represent a Loader of resources from a JAR URL.
- */
- static class JarLoader extends Loader {
- private JarFile jar;
- private URL csu;
- private JarIndex index;
- private URLStreamHandler handler;
- private HashMap<String, Loader> lmap;
- private boolean closed = false;
- private static final JavaUtilZipFileAccess zipAccess =
- SharedSecrets.getJavaUtilZipFileAccess();
-
- /*
- * Creates a new JarLoader for the specified URL referring to
- * a JAR file.
- */
- JarLoader(URL url, URLStreamHandler jarHandler,
- HashMap<String, Loader> loaderMap)
- throws IOException
- {
- super(new URL("jar", "", -1, url + "!/", jarHandler));
- csu = url;
- handler = jarHandler;
- lmap = loaderMap;
-
- ensureOpen();
- }
-
- @Override
- public void close () throws IOException {
- // closing is synchronized at higher level
- if (!closed) {
- closed = true;
- // in case not already open.
- ensureOpen();
- jar.close();
- }
- }
-
- JarFile getJarFile () {
- return jar;
- }
-
- private boolean isOptimizable(URL url) {
- return "file".equals(url.getProtocol());
- }
-
- private void ensureOpen() throws IOException {
- if (jar == null) {
- try {
- java.security.AccessController.doPrivileged(
- new java.security.PrivilegedExceptionAction<>() {
- public Void run() throws IOException {
- if (DEBUG) {
- System.err.println("Opening " + csu);
- Thread.dumpStack();
- }
-
- jar = getJarFile(csu);
- index = JarIndex.getJarIndex(jar);
- if (index != null) {
- String[] jarfiles = index.getJarFiles();
- // Add all the dependent URLs to the lmap so that loaders
- // will not be created for them by URLClassPath.getLoader(int)
- // if the same URL occurs later on the main class path. We set
- // Loader to null here to avoid creating a Loader for each
- // URL until we actually need to try to load something from them.
- for(int i = 0; i < jarfiles.length; i++) {
- try {
- URL jarURL = new URL(csu, jarfiles[i]);
- // If a non-null loader already exists, leave it alone.
- String urlNoFragString = URLUtil.urlNoFragString(jarURL);
- if (!lmap.containsKey(urlNoFragString)) {
- lmap.put(urlNoFragString, null);
- }
- } catch (MalformedURLException e) {
- continue;
- }
- }
- }
- return null;
- }
- }
- );
- } catch (java.security.PrivilegedActionException pae) {
- throw (IOException)pae.getException();
- }
- }
- }
-
- /* Throws if the given jar file is does not start with the correct LOC */
- static JarFile checkJar(JarFile jar) throws IOException {
- if (System.getSecurityManager() != null && !DISABLE_JAR_CHECKING
- && !zipAccess.startsWithLocHeader(jar)) {
- IOException x = new IOException("Invalid Jar file");
- try {
- jar.close();
- } catch (IOException ex) {
- x.addSuppressed(ex);
- }
- throw x;
- }
-
- return jar;
- }
-
- private JarFile getJarFile(URL url) throws IOException {
- // Optimize case where url refers to a local jar file
- if (isOptimizable(url)) {
- FileURLMapper p = new FileURLMapper (url);
- if (!p.exists()) {
- throw new FileNotFoundException(p.getPath());
- }
- return checkJar(new JarFile(new File(p.getPath()), true, ZipFile.OPEN_READ,
- JarFile.Release.RUNTIME));
- }
- URLConnection uc = (new URL(getBaseURL(), "#runtime")).openConnection();
- uc.setRequestProperty(USER_AGENT_JAVA_VERSION, JAVA_VERSION);
- JarFile jarFile = ((JarURLConnection)uc).getJarFile();
- return checkJar(jarFile);
- }
-
- /*
- * Returns the index of this JarLoader if it exists.
- */
- JarIndex getIndex() {
- try {
- ensureOpen();
- } catch (IOException e) {
- throw new InternalError(e);
- }
- return index;
- }
-
- /*
- * Creates the resource and if the check flag is set to true, checks if
- * is its okay to return the resource.
- */
- Resource checkResource(final String name, boolean check,
- final JarEntry entry) {
-
- final URL url;
- try {
- if (jar.isMultiRelease()) {
- // add #runtime fragment to tell JarURLConnection to use
- // runtime versioning if the underlying jar file is multi-release
- url = new URL(getBaseURL(), ParseUtil.encodePath(name, false) + "#runtime");
- } else {
- url = new URL(getBaseURL(), ParseUtil.encodePath(name, false));
- }
- if (check) {
- URLClassPath.check(url);
- }
- } catch (MalformedURLException e) {
- return null;
- // throw new IllegalArgumentException("name");
- } catch (IOException e) {
- return null;
- } catch (AccessControlException e) {
- return null;
- }
-
- return new Resource() {
- public String getName() { return name; }
- public URL getURL() { return url; }
- public URL getCodeSourceURL() { return csu; }
- public InputStream getInputStream() throws IOException
- { return jar.getInputStream(entry); }
- public int getContentLength()
- { return (int)entry.getSize(); }
- public Manifest getManifest() throws IOException
- { return jar.getManifest(); };
- public Certificate[] getCertificates()
- { return entry.getCertificates(); };
- public CodeSigner[] getCodeSigners()
- { return entry.getCodeSigners(); };
- };
- }
-
-
- /*
- * Returns true iff atleast one resource in the jar file has the same
- * package name as that of the specified resource name.
- */
- boolean validIndex(final String name) {
- String packageName = name;
- int pos;
- if((pos = name.lastIndexOf('/')) != -1) {
- packageName = name.substring(0, pos);
- }
-
- String entryName;
- ZipEntry entry;
- Enumeration<JarEntry> enum_ = jar.entries();
- while (enum_.hasMoreElements()) {
- entry = enum_.nextElement();
- entryName = entry.getName();
- if((pos = entryName.lastIndexOf('/')) != -1)
- entryName = entryName.substring(0, pos);
- if (entryName.equals(packageName)) {
- return true;
- }
- }
- return false;
- }
-
- /*
- * Returns the URL for a resource with the specified name
- */
- URL findResource(final String name, boolean check) {
- Resource rsc = getResource(name, check);
- if (rsc != null) {
- return rsc.getURL();
- }
- return null;
- }
-
- /*
- * Returns the JAR Resource for the specified name.
- */
- Resource getResource(final String name, boolean check) {
- try {
- ensureOpen();
- } catch (IOException e) {
- throw new InternalError(e);
- }
- final JarEntry entry = jar.getJarEntry(name);
- if (entry != null)
- return checkResource(name, check, entry);
-
- if (index == null)
- return null;
-
- HashSet<String> visited = new HashSet<>();
- return getResource(name, check, visited);
- }
-
- /*
- * Version of getResource() that tracks the jar files that have been
- * visited by linking through the index files. This helper method uses
- * a HashSet to store the URLs of jar files that have been searched and
- * uses it to avoid going into an infinite loop, looking for a
- * non-existent resource
- */
- Resource getResource(final String name, boolean check,
- Set<String> visited) {
-
- Resource res;
- String[] jarFiles;
- int count = 0;
- LinkedList<String> jarFilesList = null;
-
- /* If there no jar files in the index that can potential contain
- * this resource then return immediately.
- */
- if((jarFilesList = index.get(name)) == null)
- return null;
-
- do {
- int size = jarFilesList.size();
- jarFiles = jarFilesList.toArray(new String[size]);
- /* loop through the mapped jar file list */
- while(count < size) {
- String jarName = jarFiles[count++];
- JarLoader newLoader;
- final URL url;
-
- try{
- url = new URL(csu, jarName);
- String urlNoFragString = URLUtil.urlNoFragString(url);
- if ((newLoader = (JarLoader)lmap.get(urlNoFragString)) == null) {
- /* no loader has been set up for this jar file
- * before
- */
- newLoader = AccessController.doPrivileged(
- new PrivilegedExceptionAction<>() {
- public JarLoader run() throws IOException {
- return new JarLoader(url, handler,
- lmap);
- }
- });
-
- /* this newly opened jar file has its own index,
- * merge it into the parent's index, taking into
- * account the relative path.
- */
- JarIndex newIndex = newLoader.getIndex();
- if(newIndex != null) {
- int pos = jarName.lastIndexOf('/');
- newIndex.merge(this.index, (pos == -1 ?
- null : jarName.substring(0, pos + 1)));
- }
-
- /* put it in the global hashtable */
- lmap.put(urlNoFragString, newLoader);
- }
- } catch (java.security.PrivilegedActionException pae) {
- continue;
- } catch (MalformedURLException e) {
- continue;
- }
-
-
- /* Note that the addition of the url to the list of visited
- * jars incorporates a check for presence in the hashmap
- */
- boolean visitedURL = !visited.add(URLUtil.urlNoFragString(url));
- if (!visitedURL) {
- try {
- newLoader.ensureOpen();
- } catch (IOException e) {
- throw new InternalError(e);
- }
- final JarEntry entry = newLoader.jar.getJarEntry(name);
- if (entry != null) {
- return newLoader.checkResource(name, check, entry);
- }
-
- /* Verify that at least one other resource with the
- * same package name as the lookedup resource is
- * present in the new jar
- */
- if (!newLoader.validIndex(name)) {
- /* the mapping is wrong */
- throw new InvalidJarIndexException("Invalid index");
- }
- }
-
- /* If newLoader is the current loader or if it is a
- * loader that has already been searched or if the new
- * loader does not have an index then skip it
- * and move on to the next loader.
- */
- if (visitedURL || newLoader == this ||
- newLoader.getIndex() == null) {
- continue;
- }
-
- /* Process the index of the new loader
- */
- if((res = newLoader.getResource(name, check, visited))
- != null) {
- return res;
- }
- }
- // Get the list of jar files again as the list could have grown
- // due to merging of index files.
- jarFilesList = index.get(name);
-
- // If the count is unchanged, we are done.
- } while(count < jarFilesList.size());
- return null;
- }
-
-
- /*
- * Returns the JAR file local class path, or null if none.
- */
- URL[] getClassPath() throws IOException {
- if (index != null) {
- return null;
- }
-
- ensureOpen();
-
- if (SharedSecrets.javaUtilJarAccess().jarFileHasClassPathAttribute(jar)) { // Only get manifest when necessary
- Manifest man = jar.getManifest();
- if (man != null) {
- Attributes attr = man.getMainAttributes();
- if (attr != null) {
- String value = attr.getValue(Name.CLASS_PATH);
- if (value != null) {
- return parseClassPath(csu, value);
- }
- }
- }
- }
- return null;
- }
-
- /*
- * Parses value of the Class-Path manifest attribute and returns
- * an array of URLs relative to the specified base URL.
- */
- private URL[] parseClassPath(URL base, String value)
- throws MalformedURLException
- {
- StringTokenizer st = new StringTokenizer(value);
- URL[] urls = new URL[st.countTokens()];
- int i = 0;
- while (st.hasMoreTokens()) {
- String path = st.nextToken();
- urls[i] = new URL(base, path);
- i++;
- }
- return urls;
- }
- }
-
- /*
- * Inner class used to represent a loader of classes and resources
- * from a file URL that refers to a directory.
- */
- private static class FileLoader extends Loader {
- /* Canonicalized File */
- private File dir;
-
- FileLoader(URL url) throws IOException {
- super(url);
- if (!"file".equals(url.getProtocol())) {
- throw new IllegalArgumentException("url");
- }
- String path = url.getFile().replace('/', File.separatorChar);
- path = ParseUtil.decode(path);
- dir = (new File(path)).getCanonicalFile();
- }
-
- /*
- * Returns the URL for a resource with the specified name
- */
- URL findResource(final String name, boolean check) {
- Resource rsc = getResource(name, check);
- if (rsc != null) {
- return rsc.getURL();
- }
- return null;
- }
-
- Resource getResource(final String name, boolean check) {
- final URL url;
- try {
- URL normalizedBase = new URL(getBaseURL(), ".");
- url = new URL(getBaseURL(), ParseUtil.encodePath(name, false));
-
- if (url.getFile().startsWith(normalizedBase.getFile()) == false) {
- // requested resource had ../..'s in path
- return null;
- }
-
- if (check)
- URLClassPath.check(url);
-
- final File file;
- if (name.indexOf("..") != -1) {
- file = (new File(dir, name.replace('/', File.separatorChar)))
- .getCanonicalFile();
- if ( !((file.getPath()).startsWith(dir.getPath())) ) {
- /* outside of base dir */
- return null;
- }
- } else {
- file = new File(dir, name.replace('/', File.separatorChar));
- }
-
- if (file.exists()) {
- return new Resource() {
- public String getName() { return name; };
- public URL getURL() { return url; };
- public URL getCodeSourceURL() { return getBaseURL(); };
- public InputStream getInputStream() throws IOException
- { return new FileInputStream(file); };
- public int getContentLength() throws IOException
- { return (int)file.length(); };
- };
- }
- } catch (Exception e) {
- return null;
- }
- return null;
- }
- }
-}
--- a/jdk/src/java.base/share/classes/sun/net/www/protocol/jrt/JavaRuntimeURLConnection.java Fri Mar 25 15:35:43 2016 +0300
+++ b/jdk/src/java.base/share/classes/sun/net/www/protocol/jrt/JavaRuntimeURLConnection.java Tue Mar 29 13:43:29 2016 +0200
@@ -41,8 +41,8 @@
import jdk.internal.jimage.ImageReader;
import jdk.internal.jimage.ImageReaderFactory;
-import sun.misc.URLClassPath;
-import sun.misc.Resource;
+import jdk.internal.loader.URLClassPath;
+import jdk.internal.loader.Resource;
import sun.net.www.ParseUtil;
import sun.net.www.URLConnection;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/java.base/share/classes/sun/nio/ch/SocketOptionRegistry.java.template Tue Mar 29 13:43:29 2016 +0200
@@ -0,0 +1,154 @@
+/*
+ * 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+@@END_COPYRIGHT@@
+
+#include <stdio.h>
+#ifdef _WIN32
+#include <winsock2.h>
+#include <ws2tcpip.h>
+#else
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <netinet/tcp.h>
+#endif
+
+/* Defines SO_REUSEPORT */
+#if !defined(SO_REUSEPORT)
+#ifdef _WIN32
+#define SO_REUSEPORT 0
+#elif __linux__
+#define SO_REUSEPORT 15
+#elif __solaris__
+#define SO_REUSEPORT 0x100e
+#elif defined(AIX) || defined(MACOSX)
+#define SO_REUSEPORT 0x0200
+#else
+#define SO_REUSEPORT 0
+#endif
+#endif
+
+/* On Solaris, "sun" is defined as a macro. Undefine to make package
+ declaration valid */
+#undef sun
+
+/* To be able to name the Java constants the same as the C constants without
+ having the preprocessor rewrite those identifiers, add PREFIX_ to all
+ identifiers matching a C constant. The PREFIX_ is filtered out in the
+ makefile. */
+
+@@START_HERE@@
+
+package sun.nio.ch;
+import java.net.SocketOption;
+import java.net.StandardSocketOptions;
+import java.net.ProtocolFamily;
+import java.net.StandardProtocolFamily;
+import java.util.Map;
+import java.util.HashMap;
+class SocketOptionRegistry {
+
+ private SocketOptionRegistry() { }
+
+ private static class RegistryKey {
+ private final SocketOption<?> name;
+ private final ProtocolFamily family;
+ RegistryKey(SocketOption<?> name, ProtocolFamily family) {
+ this.name = name;
+ this.family = family;
+ }
+ public int hashCode() {
+ return name.hashCode() + family.hashCode();
+ }
+ public boolean equals(Object ob) {
+ if (ob == null) return false;
+ if (!(ob instanceof RegistryKey)) return false;
+ RegistryKey other = (RegistryKey)ob;
+ if (this.name != other.name) return false;
+ if (this.family != other.family) return false;
+ return true;
+ }
+ }
+
+ private static class LazyInitialization {
+
+ static final Map<RegistryKey,OptionKey> options = options();
+
+ private static Map<RegistryKey,OptionKey> options() {
+ Map<RegistryKey,OptionKey> map =
+ new HashMap<RegistryKey,OptionKey>();
+ map.put(new RegistryKey(StandardSocketOptions.PREFIX_SO_BROADCAST,
+ Net.UNSPEC), new OptionKey(SOL_SOCKET, SO_BROADCAST));
+ map.put(new RegistryKey(StandardSocketOptions.PREFIX_SO_KEEPALIVE,
+ Net.UNSPEC), new OptionKey(SOL_SOCKET, SO_KEEPALIVE));
+ map.put(new RegistryKey(StandardSocketOptions.PREFIX_SO_LINGER,
+ Net.UNSPEC), new OptionKey(SOL_SOCKET, SO_LINGER));
+ map.put(new RegistryKey(StandardSocketOptions.PREFIX_SO_SNDBUF,
+ Net.UNSPEC), new OptionKey(SOL_SOCKET, SO_SNDBUF));
+ map.put(new RegistryKey(StandardSocketOptions.PREFIX_SO_RCVBUF,
+ Net.UNSPEC), new OptionKey(SOL_SOCKET, SO_RCVBUF));
+ map.put(new RegistryKey(StandardSocketOptions.PREFIX_SO_REUSEADDR,
+ Net.UNSPEC), new OptionKey(SOL_SOCKET, SO_REUSEADDR));
+ map.put(new RegistryKey(StandardSocketOptions.PREFIX_SO_REUSEPORT,
+ Net.UNSPEC), new OptionKey(SOL_SOCKET, SO_REUSEPORT));
+ // IPPROTO_TCP is 6
+ map.put(new RegistryKey(StandardSocketOptions.PREFIX_TCP_NODELAY,
+ Net.UNSPEC), new OptionKey(6, TCP_NODELAY));
+
+ // IPPROTO_IP is 0
+ map.put(new RegistryKey(StandardSocketOptions.PREFIX_IP_TOS,
+ StandardProtocolFamily.INET), new OptionKey(0, IP_TOS));
+ map.put(new RegistryKey(StandardSocketOptions.PREFIX_IP_MULTICAST_IF,
+ StandardProtocolFamily.INET), new OptionKey(0, IP_MULTICAST_IF));
+ map.put(new RegistryKey(StandardSocketOptions.PREFIX_IP_MULTICAST_TTL,
+ StandardProtocolFamily.INET), new OptionKey(0, IP_MULTICAST_TTL));
+ map.put(new RegistryKey(StandardSocketOptions.PREFIX_IP_MULTICAST_LOOP,
+ StandardProtocolFamily.INET), new OptionKey(0, IP_MULTICAST_LOOP));
+
+#ifdef AF_INET6
+ // IPPROTO_IPV6 is 41
+ map.put(new RegistryKey(StandardSocketOptions.PREFIX_IP_TOS,
+ StandardProtocolFamily.INET6), new OptionKey(41, IPV6_TCLASS));
+ map.put(new RegistryKey(StandardSocketOptions.PREFIX_IP_MULTICAST_IF,
+ StandardProtocolFamily.INET6), new OptionKey(41, IPV6_MULTICAST_IF));
+ map.put(new RegistryKey(StandardSocketOptions.PREFIX_IP_MULTICAST_TTL,
+ StandardProtocolFamily.INET6), new OptionKey(41, IPV6_MULTICAST_HOPS));
+ map.put(new RegistryKey(StandardSocketOptions.PREFIX_IP_MULTICAST_LOOP,
+ StandardProtocolFamily.INET6), new OptionKey(41, IPV6_MULTICAST_LOOP));
+#endif
+
+ map.put(new RegistryKey(ExtendedSocketOption.PREFIX_SO_OOBINLINE,
+ Net.UNSPEC), new OptionKey(SOL_SOCKET, SO_OOBINLINE));
+ return map;
+ }
+ }
+
+ public static OptionKey findOption(SocketOption<?> name, ProtocolFamily family) {
+ RegistryKey key = new RegistryKey(name, family);
+ return LazyInitialization.options.get(key);
+ }
+}
--- a/jdk/src/java.base/share/classes/sun/security/ssl/RSAClientKeyExchange.java Fri Mar 25 15:35:43 2016 +0300
+++ b/jdk/src/java.base/share/classes/sun/security/ssl/RSAClientKeyExchange.java Tue Mar 29 13:43:29 2016 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 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
@@ -115,10 +115,31 @@
byte[] encoded = null;
try {
+ boolean needFailover = false;
Cipher cipher = JsseJce.getCipher(JsseJce.CIPHER_RSA_PKCS1);
- boolean needFailover = !KeyUtil.isOracleJCEProvider(
- cipher.getProvider().getName());
+ try {
+ // Try UNWRAP_MODE mode firstly.
+ cipher.init(Cipher.UNWRAP_MODE, privateKey,
+ new TlsRsaPremasterSecretParameterSpec(
+ maxVersion.v, currentVersion.v),
+ generator);
+
+ // The provider selection can be delayed, please don't call
+ // any Cipher method before the call to Cipher.init().
+ needFailover = !KeyUtil.isOracleJCEProvider(
+ cipher.getProvider().getName());
+ } catch (InvalidKeyException | UnsupportedOperationException iue) {
+ if (debug != null && Debug.isOn("handshake")) {
+ System.out.println("The Cipher provider " +
+ cipher.getProvider().getName() +
+ " caused exception: " + iue.getMessage());
+ }
+
+ needFailover = true;
+ }
+
if (needFailover) {
+ // Use DECRYPT_MODE and dispose the previous initialization.
cipher.init(Cipher.DECRYPT_MODE, privateKey);
boolean failed = false;
try {
@@ -134,10 +155,7 @@
maxVersion.v, currentVersion.v,
encoded, generator);
} else {
- cipher.init(Cipher.UNWRAP_MODE, privateKey,
- new TlsRsaPremasterSecretParameterSpec(
- maxVersion.v, currentVersion.v),
- generator);
+ // the cipher should have been initialized
preMaster = (SecretKey)cipher.unwrap(encrypted,
"TlsRsaPremasterSecret", Cipher.SECRET_KEY);
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/java.base/solaris/classes/sun/nio/fs/SolarisConstants.java.template Tue Mar 29 13:43:29 2016 +0200
@@ -0,0 +1,89 @@
+/*
+ * 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+@@END_COPYRIGHT@@
+
+#include <stdio.h>
+#include <errno.h>
+#include <unistd.h>
+#include <sys/acl.h>
+#include <fcntl.h>
+#include <sys/stat.h>
+
+/* On Solaris, "sun" is defined as a macro. Undefine to make package
+ declaration valid */
+#undef sun
+
+/* To be able to name the Java constants the same as the C constants without
+ having the preprocessor rewrite those identifiers, add PREFIX_ to all
+ identifiers matching a C constant. The PREFIX_ is filtered out in the
+ makefile. */
+
+@@START_HERE@@
+
+package sun.nio.fs;
+class SolarisConstants {
+
+ private SolarisConstants() { }
+
+ static final int PREFIX_O_XATTR = O_XATTR;
+ static final int PREFIX__PC_XATTR_ENABLED = _PC_XATTR_ENABLED;
+ static final int PREFIX__PC_ACL_ENABLED = _PC_ACL_ENABLED;
+ static final int PREFIX__ACL_ACE_ENABLED = _ACL_ACE_ENABLED;
+ static final int PREFIX_ACE_GETACL = ACE_GETACL;
+ static final int PREFIX_ACE_SETACL = ACE_SETACL;
+ static final int PREFIX_ACE_ACCESS_ALLOWED_ACE_TYPE = ACE_ACCESS_ALLOWED_ACE_TYPE;
+ static final int PREFIX_ACE_ACCESS_DENIED_ACE_TYPE = ACE_ACCESS_DENIED_ACE_TYPE;
+ static final int PREFIX_ACE_SYSTEM_AUDIT_ACE_TYPE = ACE_SYSTEM_AUDIT_ACE_TYPE;
+ static final int PREFIX_ACE_SYSTEM_ALARM_ACE_TYPE = ACE_SYSTEM_ALARM_ACE_TYPE;
+ static final int PREFIX_ACE_READ_DATA = ACE_READ_DATA;
+ static final int PREFIX_ACE_LIST_DIRECTORY = ACE_LIST_DIRECTORY;
+ static final int PREFIX_ACE_WRITE_DATA = ACE_WRITE_DATA;
+ static final int PREFIX_ACE_ADD_FILE = ACE_ADD_FILE;
+ static final int PREFIX_ACE_APPEND_DATA = ACE_APPEND_DATA;
+ static final int PREFIX_ACE_ADD_SUBDIRECTORY = ACE_ADD_SUBDIRECTORY;
+ static final int PREFIX_ACE_READ_NAMED_ATTRS = ACE_READ_NAMED_ATTRS;
+ static final int PREFIX_ACE_WRITE_NAMED_ATTRS = ACE_WRITE_NAMED_ATTRS;
+ static final int PREFIX_ACE_EXECUTE = ACE_EXECUTE;
+ static final int PREFIX_ACE_DELETE_CHILD = ACE_DELETE_CHILD;
+ static final int PREFIX_ACE_READ_ATTRIBUTES = ACE_READ_ATTRIBUTES;
+ static final int PREFIX_ACE_WRITE_ATTRIBUTES = ACE_WRITE_ATTRIBUTES;
+ static final int PREFIX_ACE_DELETE = ACE_DELETE;
+ static final int PREFIX_ACE_READ_ACL = ACE_READ_ACL;
+ static final int PREFIX_ACE_WRITE_ACL = ACE_WRITE_ACL;
+ static final int PREFIX_ACE_WRITE_OWNER = ACE_WRITE_OWNER;
+ static final int PREFIX_ACE_SYNCHRONIZE = ACE_SYNCHRONIZE;
+ static final int PREFIX_ACE_FILE_INHERIT_ACE = ACE_FILE_INHERIT_ACE;
+ static final int PREFIX_ACE_DIRECTORY_INHERIT_ACE = ACE_DIRECTORY_INHERIT_ACE;
+ static final int PREFIX_ACE_NO_PROPAGATE_INHERIT_ACE = ACE_NO_PROPAGATE_INHERIT_ACE;
+ static final int PREFIX_ACE_INHERIT_ONLY_ACE = ACE_INHERIT_ONLY_ACE;
+ static final int PREFIX_ACE_SUCCESSFUL_ACCESS_ACE_FLAG = ACE_SUCCESSFUL_ACCESS_ACE_FLAG;
+ static final int PREFIX_ACE_FAILED_ACCESS_ACE_FLAG = ACE_FAILED_ACCESS_ACE_FLAG;
+ static final int PREFIX_ACE_IDENTIFIER_GROUP = ACE_IDENTIFIER_GROUP;
+ static final int PREFIX_ACE_OWNER = ACE_OWNER;
+ static final int PREFIX_ACE_GROUP = ACE_GROUP;
+ static final int PREFIX_ACE_EVERYONE = ACE_EVERYONE;
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/java.base/unix/classes/jdk/internal/loader/FileURLMapper.java Tue Mar 29 13:43:29 2016 +0200
@@ -0,0 +1,81 @@
+/*
+ * Copyright (c) 2002, 2003, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.internal.loader;
+
+import java.net.URL;
+import java.io.File;
+import sun.net.www.ParseUtil;
+
+/**
+ * (Solaris) platform specific handling for file: URLs .
+ * urls must not contain a hostname in the authority field
+ * other than "localhost".
+ *
+ * This implementation could be updated to map such URLs
+ * on to /net/host/...
+ *
+ * @author Michael McMahon
+ */
+
+public class FileURLMapper {
+
+ URL url;
+ String path;
+
+ public FileURLMapper (URL url) {
+ this.url = url;
+ }
+
+ /**
+ * @return the platform specific path corresponding to the URL
+ * so long as the URL does not contain a hostname in the authority field.
+ */
+
+ public String getPath () {
+ if (path != null) {
+ return path;
+ }
+ String host = url.getHost();
+ if (host == null || "".equals(host) || "localhost".equalsIgnoreCase (host)) {
+ path = url.getFile();
+ path = ParseUtil.decode (path);
+ }
+ return path;
+ }
+
+ /**
+ * Checks whether the file identified by the URL exists.
+ */
+ public boolean exists () {
+ String s = getPath ();
+ if (s == null) {
+ return false;
+ } else {
+ File f = new File (s);
+ return f.exists();
+ }
+ }
+}
--- a/jdk/src/java.base/unix/classes/sun/misc/FileURLMapper.java Fri Mar 25 15:35:43 2016 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,81 +0,0 @@
-/*
- * Copyright (c) 2002, 2003, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.misc;
-
-import java.net.URL;
-import java.io.File;
-import sun.net.www.ParseUtil;
-
-/**
- * (Solaris) platform specific handling for file: URLs .
- * urls must not contain a hostname in the authority field
- * other than "localhost".
- *
- * This implementation could be updated to map such URLs
- * on to /net/host/...
- *
- * @author Michael McMahon
- */
-
-public class FileURLMapper {
-
- URL url;
- String path;
-
- public FileURLMapper (URL url) {
- this.url = url;
- }
-
- /**
- * @return the platform specific path corresponding to the URL
- * so long as the URL does not contain a hostname in the authority field.
- */
-
- public String getPath () {
- if (path != null) {
- return path;
- }
- String host = url.getHost();
- if (host == null || "".equals(host) || "localhost".equalsIgnoreCase (host)) {
- path = url.getFile();
- path = ParseUtil.decode (path);
- }
- return path;
- }
-
- /**
- * Checks whether the file identified by the URL exists.
- */
- public boolean exists () {
- String s = getPath ();
- if (s == null) {
- return false;
- } else {
- File f = new File (s);
- return f.exists();
- }
- }
-}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/java.base/unix/classes/sun/nio/fs/UnixConstants.java.template Tue Mar 29 13:43:29 2016 +0200
@@ -0,0 +1,132 @@
+/*
+ * 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+@@END_COPYRIGHT@@
+
+#include <stdio.h>
+#include <errno.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <sys/stat.h>
+
+/* On Solaris, "sun" is defined as a macro. Undefine to make package
+ declaration valid */
+#undef sun
+
+/* To be able to name the Java constants the same as the C constants without
+ having the preprocessor rewrite those identifiers, add PREFIX_ to all
+ identifiers matching a C constant. The PREFIX_ is filtered out in the
+ makefile. */
+
+@@START_HERE@@
+
+package sun.nio.fs;
+class UnixConstants {
+ private UnixConstants() { }
+ static final int PREFIX_O_RDONLY = O_RDONLY;
+ static final int PREFIX_O_WRONLY = O_WRONLY;
+ static final int PREFIX_O_RDWR = O_RDWR;
+ static final int PREFIX_O_APPEND = O_APPEND;
+ static final int PREFIX_O_CREAT = O_CREAT;
+ static final int PREFIX_O_EXCL = O_EXCL;
+ static final int PREFIX_O_TRUNC = O_TRUNC;
+ static final int PREFIX_O_SYNC = O_SYNC;
+
+#ifndef O_DSYNC
+ // At least FreeBSD doesn't define O_DSYNC
+ static final int PREFIX_O_DSYNC = O_SYNC;
+#else
+ static final int PREFIX_O_DSYNC = O_DSYNC;
+#endif
+
+#ifdef O_NOFOLLOW
+ static final int PREFIX_O_NOFOLLOW = O_NOFOLLOW;
+#else
+ // not supported (dummy values will not be used at runtime).
+ static final int PREFIX_O_NOFOLLOW = 00;
+#endif
+
+
+ static final int PREFIX_S_IAMB =
+ (S_IRUSR|S_IWUSR|S_IXUSR|S_IRGRP|S_IWGRP|S_IXGRP|S_IROTH|S_IWOTH|S_IXOTH);
+ static final int PREFIX_S_IRUSR = S_IRUSR;
+ static final int PREFIX_S_IWUSR = S_IWUSR;
+ static final int PREFIX_S_IXUSR = S_IXUSR;
+ static final int PREFIX_S_IRGRP = S_IRGRP;
+ static final int PREFIX_S_IWGRP = S_IWGRP;
+ static final int PREFIX_S_IXGRP = S_IXGRP;
+ static final int PREFIX_S_IROTH = S_IROTH;
+ static final int PREFIX_S_IWOTH = S_IWOTH;
+ static final int PREFIX_S_IXOTH = S_IXOTH;
+
+ static final int PREFIX_S_IFMT = S_IFMT;
+ static final int PREFIX_S_IFREG = S_IFREG;
+ static final int PREFIX_S_IFDIR = S_IFDIR;
+ static final int PREFIX_S_IFLNK = S_IFLNK;
+ static final int PREFIX_S_IFCHR = S_IFCHR;
+ static final int PREFIX_S_IFBLK = S_IFBLK;
+ static final int PREFIX_S_IFIFO = S_IFIFO;
+ static final int PREFIX_R_OK = R_OK;
+ static final int PREFIX_W_OK = W_OK;
+ static final int PREFIX_X_OK = X_OK;
+ static final int PREFIX_F_OK = F_OK;
+ static final int PREFIX_ENOENT = ENOENT;
+ static final int PREFIX_ENXIO = ENXIO;
+ static final int PREFIX_EACCES = EACCES;
+ static final int PREFIX_EEXIST = EEXIST;
+ static final int PREFIX_ENOTDIR = ENOTDIR;
+ static final int PREFIX_EINVAL = EINVAL;
+ static final int PREFIX_EXDEV = EXDEV;
+ static final int PREFIX_EISDIR = EISDIR;
+ static final int PREFIX_ENOTEMPTY = ENOTEMPTY;
+ static final int PREFIX_ENOSPC = ENOSPC;
+ static final int PREFIX_EAGAIN = EAGAIN;
+ static final int PREFIX_ENOSYS = ENOSYS;
+ static final int PREFIX_ELOOP = ELOOP;
+ static final int PREFIX_EROFS = EROFS;
+
+#ifndef ENODATA
+ // Only used in Linux java source, provide any value so it compiles
+ static final int PREFIX_ENODATA = ELAST;
+#else
+ static final int PREFIX_ENODATA = ENODATA;
+#endif
+
+ static final int PREFIX_ERANGE = ERANGE;
+ static final int PREFIX_EMFILE = EMFILE;
+
+ // flags used with openat/unlinkat/etc.
+#if defined(AT_SYMLINK_NOFOLLOW) && defined(AT_REMOVEDIR)
+ static final int PREFIX_AT_SYMLINK_NOFOLLOW = AT_SYMLINK_NOFOLLOW;
+ static final int PREFIX_AT_REMOVEDIR = AT_REMOVEDIR;
+#else
+ // not supported (dummy values will not be used at runtime).
+ static final int PREFIX_AT_SYMLINK_NOFOLLOW = 00;
+ static final int PREFIX_AT_REMOVEDIR = 00;
+#endif
+
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/java.base/windows/classes/jdk/internal/loader/FileURLMapper.java Tue Mar 29 13:43:29 2016 +0200
@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) 2002, 2003, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.internal.loader;
+
+import java.net.URL;
+import java.io.File;
+import sun.net.www.ParseUtil;
+
+/**
+ * (Windows) Platform specific handling for file: URLs . In particular deals
+ * with network paths mapping them to UNCs.
+ *
+ * @author Michael McMahon
+ */
+
+public class FileURLMapper {
+
+ URL url;
+ String file;
+
+ public FileURLMapper (URL url) {
+ this.url = url;
+ }
+
+ /**
+ * @return the platform specific path corresponding to the URL, and in particular
+ * returns a UNC when the authority contains a hostname
+ */
+
+ public String getPath () {
+ if (file != null) {
+ return file;
+ }
+ String host = url.getHost();
+ if (host != null && !host.equals("") &&
+ !"localhost".equalsIgnoreCase(host)) {
+ String rest = url.getFile();
+ String s = host + ParseUtil.decode (url.getFile());
+ file = "\\\\"+ s.replace('/', '\\');
+ return file;
+ }
+ String path = url.getFile().replace('/', '\\');
+ file = ParseUtil.decode(path);
+ return file;
+ }
+
+ public boolean exists() {
+ String path = getPath();
+ File f = new File (path);
+ return f.exists();
+ }
+}
--- a/jdk/src/java.base/windows/classes/sun/misc/FileURLMapper.java Fri Mar 25 15:35:43 2016 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,75 +0,0 @@
-/*
- * Copyright (c) 2002, 2003, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.misc;
-
-import java.net.URL;
-import java.io.File;
-import sun.net.www.ParseUtil;
-
-/**
- * (Windows) Platform specific handling for file: URLs . In particular deals
- * with network paths mapping them to UNCs.
- *
- * @author Michael McMahon
- */
-
-public class FileURLMapper {
-
- URL url;
- String file;
-
- public FileURLMapper (URL url) {
- this.url = url;
- }
-
- /**
- * @return the platform specific path corresponding to the URL, and in particular
- * returns a UNC when the authority contains a hostname
- */
-
- public String getPath () {
- if (file != null) {
- return file;
- }
- String host = url.getHost();
- if (host != null && !host.equals("") &&
- !"localhost".equalsIgnoreCase(host)) {
- String rest = url.getFile();
- String s = host + ParseUtil.decode (url.getFile());
- file = "\\\\"+ s.replace('/', '\\');
- return file;
- }
- String path = url.getFile().replace('/', '\\');
- file = ParseUtil.decode(path);
- return file;
- }
-
- public boolean exists() {
- String path = getPath();
- File f = new File (path);
- return f.exists();
- }
-}
--- a/jdk/src/java.httpclient/share/classes/java/net/http/Log.java Fri Mar 25 15:35:43 2016 +0300
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/Log.java Tue Mar 29 13:43:29 2016 +0200
@@ -24,7 +24,6 @@
package java.net.http;
import java.util.Locale;
-import sun.util.logging.PlatformLogger;
/**
* -Djava.net.HttpClient.log=errors,requests,headers,frames[:type:type2:..],content
@@ -35,9 +34,11 @@
*
* Logger name is "java.net.http.HttpClient"
*/
-class Log {
+// implements System.Logger in order to be skipped when printing the caller's
+// information
+abstract class Log implements System.Logger {
- final static String logProp = "java.net.http.HttpClient.log";
+ static final String logProp = "java.net.http.HttpClient.log";
public static final int OFF = 0;
public static final int ERRORS = 0x1;
@@ -55,7 +56,7 @@
public static final int ALL = CONTROL| DATA | WINDOW_UPDATES;
static int frametypes;
- static sun.util.logging.PlatformLogger logger;
+ static final System.Logger logger;
static {
String s = Utils.getNetProperty(logProp);
@@ -111,7 +112,9 @@
}
}
if (logging != OFF) {
- logger = PlatformLogger.getLogger("java.net.http.HttpClient");
+ logger = System.getLogger("java.net.http.HttpClient");
+ } else {
+ logger = null;
}
}
@@ -137,34 +140,38 @@
static void logError(String s) {
if (errors())
- logger.info("ERROR: " + s);
+ logger.log(Level.INFO, "ERROR: " + s);
}
static void logError(Throwable t) {
if (errors()) {
String s = Utils.stackTrace(t);
- logger.info("ERROR: " + s);
+ logger.log(Level.INFO, "ERROR: " + s);
}
}
static void logSSL(String s) {
if (ssl())
- logger.info("SSL: " + s);
+ logger.log(Level.INFO, "SSL: " + s);
}
static void logRequest(String s) {
if (requests())
- logger.info("REQUEST: " + s);
+ logger.log(Level.INFO, "REQUEST: " + s);
}
static void logResponse(String s) {
if (requests())
- logger.info("RESPONSE: " + s);
+ logger.log(Level.INFO, "RESPONSE: " + s);
}
static void logHeaders(String s) {
if (headers())
- logger.info("HEADERS: " + s);
+ logger.log(Level.INFO, "HEADERS: " + s);
}
+
+ // not instantiable
+ private Log() {}
+
// END HTTP2
}
--- a/jdk/src/java.rmi/share/classes/sun/rmi/registry/RegistryImpl.java Fri Mar 25 15:35:43 2016 +0300
+++ b/jdk/src/java.rmi/share/classes/sun/rmi/registry/RegistryImpl.java Tue Mar 29 13:43:29 2016 +0200
@@ -25,10 +25,15 @@
package sun.rmi.registry;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.ArrayList;
import java.util.Enumeration;
import java.util.Hashtable;
+import java.util.List;
import java.util.MissingResourceException;
import java.util.ResourceBundle;
+import java.io.File;
import java.io.FilePermission;
import java.io.IOException;
import java.net.*;
@@ -333,6 +338,30 @@
}
/**
+ * Convert class path specification into an array of file URLs.
+ *
+ * The path of the file is converted to a URI then into URL
+ * form so that reserved characters can safely appear in the path.
+ */
+ private static URL[] pathToURLs(String path) {
+ List<URL> paths = new ArrayList<>();
+ for (String entry: path.split(File.pathSeparator)) {
+ Path p = Paths.get(entry);
+ try {
+ p = p.toRealPath();
+ } catch (IOException x) {
+ p = p.toAbsolutePath();
+ }
+ try {
+ paths.add(p.toUri().toURL());
+ } catch (MalformedURLException e) {
+ //ignore / skip entry
+ }
+ }
+ return paths.toArray(new URL[0]);
+ }
+
+ /**
* Main program to start a registry. <br>
* The port number can be specified on the command line.
*/
@@ -362,7 +391,7 @@
if (envcp == null) {
envcp = "."; // preserve old default behavior
}
- URL[] urls = sun.misc.URLClassPath.pathToURLs(envcp);
+ URL[] urls = pathToURLs(envcp);
ClassLoader cl = new URLClassLoader(urls);
/*
--- a/jdk/src/jdk.deploy.osx/macosx/classes/module-info.java Fri Mar 25 15:35:43 2016 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-/*
- * Copyright (c) 2014, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-module jdk.deploy.osx {
- requires java.desktop;
- requires java.scripting;
-}
-
--- a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/IncludeLocalesPlugin.java Fri Mar 25 15:35:43 2016 +0300
+++ b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/IncludeLocalesPlugin.java Tue Mar 29 13:43:29 2016 +0200
@@ -155,9 +155,13 @@
@Override
public void configure(Map<String, String> config) {
- priorityList = Arrays.stream(config.get(NAME).split(","))
- .map(Locale.LanguageRange::new)
- .collect(Collectors.toList());
+ try {
+ priorityList = Arrays.stream(config.get(NAME).split(","))
+ .map(Locale.LanguageRange::new)
+ .collect(Collectors.toList());
+ } catch (IllegalArgumentException iae) {
+ throw new PluginException(iae.getLocalizedMessage());
+ }
}
@Override
@@ -168,7 +172,7 @@
// jdk.localedata module validation
Set<String> packages = module.getAllPackages();
if (!packages.containsAll(LOCALEDATA_PACKAGES)) {
- throw new PluginException("Missing locale data packages in jdk.localedata:\n\t" +
+ throw new PluginException(PluginsResourceBundle.getMessage(NAME + ".missingpackages") +
LOCALEDATA_PACKAGES.stream()
.filter(pn -> !packages.contains(pn))
.collect(Collectors.joining(",\n\t")));
@@ -186,6 +190,10 @@
filtered = filterLocales(available);
+ if (filtered.isEmpty()) {
+ throw new PluginException(PluginsResourceBundle.getMessage(NAME + ".nomatchinglocales"));
+ }
+
try {
String value = META_FILES + filtered.stream()
.map(s -> includeLocaleFilePatterns(s))
--- a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/resources/plugins.properties Fri Mar 25 15:35:43 2016 +0300
+++ b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/resources/plugins.properties Tue Mar 29 13:43:29 2016 +0200
@@ -68,9 +68,18 @@
zip.description=ZIP Compression
-include-locales.argument=<langtag>[,<langtag>]*
+include-locales.argument=\
+<langtag>[,<langtag>]*
-include-locales.description=BCP 47 language tags separated by a comma, allowing locale matching\ndefined in RFC 4647. eg: en,ja,*-IN
+include-locales.description=\
+BCP 47 language tags separated by a comma, allowing locale matching\n\
+defined in RFC 4647. eg: en,ja,*-IN
+
+include-locales.missingpackages=\
+Missing locale data packages in jdk.localedata:\n\t
+
+include-locales.nomatchinglocales=\
+No matching locales found. Check the specified pattern.
main.status.ok=Functional.
--- a/jdk/test/ProblemList.txt Fri Mar 25 15:35:43 2016 +0300
+++ b/jdk/test/ProblemList.txt Tue Mar 29 13:43:29 2016 +0200
@@ -354,6 +354,9 @@
# 8059906 fails on solaris and macosx, 8151901
tools/pack200/Pack200Test.java generic-all
+# 8152622
+tools/pack200/Pack200Props.java macosx-all
+
# 8068049
tools/launcher/FXLauncherTest.java linux-all,macosx-all
--- a/jdk/test/tools/jlink/SecurityTest.java Fri Mar 25 15:35:43 2016 +0300
+++ b/jdk/test/tools/jlink/SecurityTest.java Tue Mar 29 13:43:29 2016 +0200
@@ -25,7 +25,7 @@
* @test
* @summary Test JlinkPermission
* @author Jean-Francois Denise
- * @run main SecurityTest
+ * @run main/othervm SecurityTest
*/
import java.security.AccessControlException;
@@ -36,16 +36,11 @@
public static void main(String[] args) throws Exception {
new Jlink();
System.setSecurityManager(new SecurityManager());
- boolean failed = false;
try {
new Jlink();
- failed = true;
+ throw new Exception("Call should have failed");
} catch (AccessControlException ex) {
- //XXX OK.
+ // expected exception
}
- if (failed) {
- throw new Exception("Call should have failed");
- }
-
}
}
--- a/jdk/test/tools/jlink/plugins/IncludeLocalesPluginTest.java Fri Mar 25 15:35:43 2016 +0300
+++ b/jdk/test/tools/jlink/plugins/IncludeLocalesPluginTest.java Tue Mar 29 13:43:29 2016 +0200
@@ -21,26 +21,18 @@
* questions.
*/
-import java.io.BufferedReader;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.lang.reflect.Layer;
-import java.nio.file.Files;
import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.ArrayList;
-import java.util.Collections;
import java.util.List;
-import java.util.stream.Stream;
import jdk.tools.jlink.plugin.Plugin;
+import jdk.tools.jlink.plugin.PluginException;
import jdk.tools.jlink.internal.PluginRepository;
+import jdk.tools.jlink.internal.TaskHelper;
+import jdk.tools.jlink.internal.plugins.PluginsResourceBundle;
import tests.Helper;
import tests.JImageGenerator;
import tests.JImageValidator;
+import tests.Result;
/*
* @test
@@ -50,6 +42,7 @@
* @modules java.base/jdk.internal.jimage
* jdk.jdeps/com.sun.tools.classfile
* jdk.jlink/jdk.tools.jlink.internal
+ * jdk.jlink/jdk.tools.jlink.internal.plugins
* jdk.jlink/jdk.tools.jmod
* jdk.jlink/jdk.tools.jimage
* jdk.compiler
@@ -65,6 +58,7 @@
private final static int EXPECTED_LOCATIONS = 1;
private final static int UNEXPECTED_PATHS = 2;
private final static int AVAILABLE_LOCALES = 3;
+ private final static int ERROR_MESSAGE = 4;
private final static Object[][] testData = {
// without --include-locales option: should include all locales
@@ -144,6 +138,7 @@
"yav_CM yo yo_BJ yo_NG zgh zgh_MA zh zh_CN zh_CN_#Hans zh_HK " +
"zh_HK_#Hans zh_HK_#Hant zh_MO_#Hans zh_MO_#Hant zh_SG zh_SG_#Hans " +
"zh_TW zh_TW_#Hant zh__#Hans zh__#Hant zu zu_ZA",
+ "",
},
// All English/Japanese locales
@@ -173,6 +168,7 @@
"en_PW en_RW en_SB en_SC en_SD en_SG en_SH en_SL en_SS en_SX en_SZ " +
"en_TC en_TK en_TO en_TT en_TV en_TZ en_UG en_UM en_US en_US_POSIX " +
"en_VC en_VG en_VI en_VU en_WS en_ZA en_ZM en_ZW ja ja_JP ja_JP_JP_#u-ca-japanese",
+ "",
},
// All locales in India
@@ -201,6 +197,7 @@
"/jdk.localedata/sun/text/resources/cldr/ext/FormatData_zh.class"),
" as_IN bn_IN bo_IN brx_IN en en_IN en_US en_US_POSIX gu_IN hi_IN kn_IN " +
"kok_IN ks_IN_#Arab ml_IN mr_IN ne_IN or_IN pa_IN_#Guru ta_IN te_IN ur_IN",
+ "",
},
// Thai
@@ -220,6 +217,7 @@
"/jdk.localedata/sun/text/resources/cldr/ext/FormatData_ja.class",
"/jdk.localedata/sun/text/resources/cldr/ext/FormatData_zh.class"),
" en en_US en_US_POSIX th th_TH th_TH_TH_#u-nu-thai",
+ "",
},
// Hong Kong
@@ -242,6 +240,7 @@
"/jdk.localedata/sun/text/resources/cldr/ext/FormatData_ja.class",
"/jdk.localedata/sun/text/resources/cldr/ext/FormatData_th.class"),
" en en_US en_US_POSIX zh_HK zh_HK_#Hans zh_HK_#Hant",
+ "",
},
// Norwegian
@@ -265,6 +264,7 @@
"/jdk.localedata/sun/text/resources/cldr/ext/FormatData_ja.class",
"/jdk.localedata/sun/text/resources/cldr/ext/FormatData_th.class"),
" en en_US en_US_POSIX nb nb_NO nb_SJ nn nn_NO no no_NO no_NO_NY",
+ "",
},
// Hebrew/Indonesian/Yiddish
@@ -290,6 +290,25 @@
"/jdk.localedata/sun/text/resources/cldr/ext/FormatData_ja.class",
"/jdk.localedata/sun/text/resources/cldr/ext/FormatData_th.class"),
" en en_US en_US_POSIX in in_ID iw iw_IL ji ji_001",
+ "",
+ },
+
+ // Error case: No matching locales
+ {"--include-locales=xyz",
+ null,
+ null,
+ null,
+ new PluginException(
+ PluginsResourceBundle.getMessage("include-locales.nomatchinglocales"))
+ .toString(),
+ },
+
+ // Error case: Invalid argument
+ {"--include-locales=zh_HK",
+ null,
+ null,
+ null,
+ "range=zh_hk",
},
};
@@ -304,20 +323,28 @@
for (Object[] data : testData) {
// create image for each test data
- Path image = JImageGenerator.getJLinkTask()
+ Result result = JImageGenerator.getJLinkTask()
.modulePath(helper.defaultModulePath())
.output(helper.createNewImageDir(moduleName))
.addMods("jdk.localedata")
.option((String)data[INCLUDE_LOCALES_OPTION])
- .call().assertSuccess();
+ .call();
+
+ String errorMsg = (String)data[ERROR_MESSAGE];
+ if (errorMsg.isEmpty()) {
+ Path image = result.assertSuccess();
- // test locale data entries
- testLocaleDataEntries(image,
- (List<String>)data[EXPECTED_LOCATIONS],
- (List<String>)data[UNEXPECTED_PATHS]);
+ // test locale data entries
+ testLocaleDataEntries(image,
+ (List<String>)data[EXPECTED_LOCATIONS],
+ (List<String>)data[UNEXPECTED_PATHS]);
- // test available locales
- testAvailableLocales(image, (String)data[AVAILABLE_LOCALES]);
+ // test available locales
+ testAvailableLocales(image, (String)data[AVAILABLE_LOCALES]);
+ } else {
+ result.assertFailure(new TaskHelper(TaskHelper.JLINK_BUNDLE)
+ .getMessage("error.prefix") + " " +errorMsg);
+ }
}
}