Why
@@ -1136,15 +1135,15 @@ class Thread implements Runnable {
/**
* Resumes a suspended thread.
*
- * First, the checkAccess method of this thread is called
+ * First, the {@code checkAccess} method of this thread is called
* with no arguments. This may result in throwing a
- * SecurityException (in the current thread).
+ * {@code SecurityException} (in the current thread).
*
* If the thread is alive but suspended, it is resumed and is
* permitted to make progress in its execution.
*
- * @exception SecurityException if the current thread cannot modify this
- * thread.
+ * @throws SecurityException if the current thread cannot modify this
+ * thread.
* @see #checkAccess
* @see #suspend()
* @deprecated This method exists solely for use with {@link #suspend},
@@ -1162,19 +1161,18 @@ class Thread implements Runnable {
/**
* Changes the priority of this thread.
*
- * First the checkAccess method of this thread is called
- * with no arguments. This may result in throwing a
- * SecurityException.
+ * First the {@code checkAccess} method of this thread is called
+ * with no arguments. This may result in throwing a {@code SecurityException}.
*
* Otherwise, the priority of this thread is set to the smaller of
- * the specified newPriority and the maximum permitted
+ * the specified {@code newPriority} and the maximum permitted
* priority of the thread's thread group.
*
* @param newPriority priority to set this thread to
- * @exception IllegalArgumentException If the priority is not in the
- * range MIN_PRIORITY to
- * MAX_PRIORITY.
- * @exception SecurityException if the current thread cannot modify
+ * @throws IllegalArgumentException If the priority is not in the
+ * range {@code MIN_PRIORITY} to
+ * {@code MAX_PRIORITY}.
+ * @throws SecurityException if the current thread cannot modify
* this thread.
* @see #getPriority
* @see #checkAccess()
@@ -1208,16 +1206,15 @@ class Thread implements Runnable {
}
/**
- * Changes the name of this thread to be equal to the argument
- * name.
+ * Changes the name of this thread to be equal to the argument {@code name}.
*
- * First the checkAccess method of this thread is called
+ * First the {@code checkAccess} method of this thread is called
* with no arguments. This may result in throwing a
- * SecurityException.
+ * {@code SecurityException}.
*
* @param name the new name for this thread.
- * @exception SecurityException if the current thread cannot modify this
- * thread.
+ * @throws SecurityException if the current thread cannot modify this
+ * thread.
* @see #getName
* @see #checkAccess()
*/
@@ -1309,7 +1306,7 @@ class Thread implements Runnable {
* be suspended.
*
* @return the number of stack frames in this thread.
- * @exception IllegalThreadStateException if this thread is not
+ * @throws IllegalThreadStateException if this thread is not
* suspended.
* @deprecated The definition of this call depends on {@link #suspend},
* which is deprecated. Further, the results of this call
@@ -1465,8 +1462,8 @@ class Thread implements Runnable {
/**
* Tests if this thread is a daemon thread.
*
- * @return true if this thread is a daemon thread;
- * false otherwise.
+ * @return {@code true} if this thread is a daemon thread;
+ * {@code false} otherwise.
* @see #setDaemon(boolean)
*/
public final boolean isDaemon() {
@@ -1477,12 +1474,12 @@ class Thread implements Runnable {
* Determines if the currently running thread has permission to
* modify this thread.
*
- * If there is a security manager, its checkAccess method
+ * If there is a security manager, its {@code checkAccess} method
* is called with this thread as its argument. This may result in
- * throwing a SecurityException.
+ * throwing a {@code SecurityException}.
*
- * @exception SecurityException if the current thread is not allowed to
- * access this thread.
+ * @throws SecurityException if the current thread is not allowed to
+ * access this thread.
* @see SecurityManager#checkAccess(Thread)
*/
public final void checkAccess() {
diff --git a/src/java.base/share/classes/java/lang/ThreadGroup.java b/src/java.base/share/classes/java/lang/ThreadGroup.java
index 2315c202329..cedb44e73d5 100644
--- a/src/java.base/share/classes/java/lang/ThreadGroup.java
+++ b/src/java.base/share/classes/java/lang/ThreadGroup.java
@@ -82,11 +82,11 @@ class ThreadGroup implements Thread.UncaughtExceptionHandler {
* Constructs a new thread group. The parent of this new group is
* the thread group of the currently running thread.
*
- * The checkAccess method of the parent thread group is
+ * The {@code checkAccess} method of the parent thread group is
* called with no arguments; this may result in a security exception.
*
* @param name the name of the new thread group.
- * @exception SecurityException if the current thread cannot create a
+ * @throws SecurityException if the current thread cannot create a
* thread in the specified thread group.
* @see java.lang.ThreadGroup#checkAccess()
* @since 1.0
@@ -99,14 +99,14 @@ class ThreadGroup implements Thread.UncaughtExceptionHandler {
* Creates a new thread group. The parent of this new group is the
* specified thread group.
*
- * The checkAccess method of the parent thread group is
+ * The {@code checkAccess} method of the parent thread group is
* called with no arguments; this may result in a security exception.
*
* @param parent the parent thread group.
* @param name the name of the new thread group.
- * @exception NullPointerException if the thread group argument is
- * null.
- * @exception SecurityException if the current thread cannot create a
+ * @throws NullPointerException if the thread group argument is
+ * {@code null}.
+ * @throws SecurityException if the current thread cannot create a
* thread in the specified thread group.
* @see java.lang.SecurityException
* @see java.lang.ThreadGroup#checkAccess()
@@ -147,13 +147,13 @@ class ThreadGroup implements Thread.UncaughtExceptionHandler {
/**
* Returns the parent of this thread group.
*
- * First, if the parent is not null, the
- * checkAccess method of the parent thread group is
+ * First, if the parent is not {@code null}, the
+ * {@code checkAccess} method of the parent thread group is
* called with no arguments; this may result in a security exception.
*
* @return the parent of this thread group. The top-level thread group
- * is the only thread group whose parent is null.
- * @exception SecurityException if the current thread cannot modify
+ * is the only thread group whose parent is {@code null}.
+ * @throws SecurityException if the current thread cannot modify
* this thread group.
* @see java.lang.ThreadGroup#checkAccess()
* @see java.lang.SecurityException
@@ -185,8 +185,8 @@ class ThreadGroup implements Thread.UncaughtExceptionHandler {
* daemon thread group is automatically destroyed when its last
* thread is stopped or its last thread group is destroyed.
*
- * @return true if this thread group is a daemon thread group;
- * false otherwise.
+ * @return {@code true} if this thread group is a daemon thread group;
+ * {@code false} otherwise.
* @since 1.0
*/
public final boolean isDaemon() {
@@ -206,16 +206,16 @@ class ThreadGroup implements Thread.UncaughtExceptionHandler {
/**
* Changes the daemon status of this thread group.
*
- * First, the checkAccess method of this thread group is
+ * First, the {@code checkAccess} method of this thread group is
* called with no arguments; this may result in a security exception.
*
* A daemon thread group is automatically destroyed when its last
* thread is stopped or its last thread group is destroyed.
*
- * @param daemon if true, marks this thread group as
+ * @param daemon if {@code true}, marks this thread group as
* a daemon thread group; otherwise, marks this
* thread group as normal.
- * @exception SecurityException if the current thread cannot modify
+ * @throws SecurityException if the current thread cannot modify
* this thread group.
* @see java.lang.SecurityException
* @see java.lang.ThreadGroup#checkAccess()
@@ -230,24 +230,24 @@ class ThreadGroup implements Thread.UncaughtExceptionHandler {
* Sets the maximum priority of the group. Threads in the thread
* group that already have a higher priority are not affected.
*
- * First, the checkAccess method of this thread group is
+ * First, the {@code checkAccess} method of this thread group is
* called with no arguments; this may result in a security exception.
*
- * If the pri argument is less than
+ * If the {@code pri} argument is less than
* {@link Thread#MIN_PRIORITY} or greater than
* {@link Thread#MAX_PRIORITY}, the maximum priority of the group
* remains unchanged.
*
* Otherwise, the priority of this ThreadGroup object is set to the
- * smaller of the specified pri and the maximum permitted
+ * smaller of the specified {@code pri} and the maximum permitted
* priority of the parent of this thread group. (If this thread group
* is the system thread group, which has no parent, then its maximum
- * priority is simply set to pri.) Then this method is
- * called recursively, with pri as its argument, for
+ * priority is simply set to {@code pri}.) Then this method is
+ * called recursively, with {@code pri} as its argument, for
* every thread group that belongs to this thread group.
*
* @param pri the new priority of the thread group.
- * @exception SecurityException if the current thread cannot modify
+ * @throws SecurityException if the current thread cannot modify
* this thread group.
* @see #getMaxPriority
* @see java.lang.SecurityException
@@ -280,9 +280,9 @@ class ThreadGroup implements Thread.UncaughtExceptionHandler {
* argument or one of its ancestor thread groups.
*
* @param g a thread group.
- * @return true if this thread group is the thread group
+ * @return {@code true} if this thread group is the thread group
* argument or one of its ancestor thread groups;
- * false otherwise.
+ * {@code false} otherwise.
* @since 1.0
*/
public final boolean parentOf(ThreadGroup g) {
@@ -298,11 +298,11 @@ class ThreadGroup implements Thread.UncaughtExceptionHandler {
* Determines if the currently running thread has permission to
* modify this thread group.
*
- * If there is a security manager, its checkAccess method
+ * If there is a security manager, its {@code checkAccess} method
* is called with this thread group as its argument. This may result
- * in throwing a SecurityException.
+ * in throwing a {@code SecurityException}.
*
- * @exception SecurityException if the current thread is not allowed to
+ * @throws SecurityException if the current thread is not allowed to
* access this thread group.
* @see java.lang.SecurityManager#checkAccess(java.lang.ThreadGroup)
* @since 1.0
@@ -589,13 +589,13 @@ class ThreadGroup implements Thread.UncaughtExceptionHandler {
/**
* Stops all threads in this thread group.
*
- * First, the checkAccess method of this thread group is
+ * First, the {@code checkAccess} method of this thread group is
* called with no arguments; this may result in a security exception.
*
- * This method then calls the stop method on all the
+ * This method then calls the {@code stop} method on all the
* threads in this thread group and in all of its subgroups.
*
- * @exception SecurityException if the current thread is not allowed
+ * @throws SecurityException if the current thread is not allowed
* to access this thread group or any of the threads in
* the thread group.
* @see java.lang.SecurityException
@@ -614,13 +614,13 @@ class ThreadGroup implements Thread.UncaughtExceptionHandler {
/**
* Interrupts all threads in this thread group.
*
- * First, the checkAccess method of this thread group is
+ * First, the {@code checkAccess} method of this thread group is
* called with no arguments; this may result in a security exception.
*
- * This method then calls the interrupt method on all the
+ * This method then calls the {@code interrupt} method on all the
* threads in this thread group and in all of its subgroups.
*
- * @exception SecurityException if the current thread is not allowed
+ * @throws SecurityException if the current thread is not allowed
* to access this thread group or any of the threads in
* the thread group.
* @see java.lang.Thread#interrupt()
@@ -651,13 +651,13 @@ class ThreadGroup implements Thread.UncaughtExceptionHandler {
/**
* Suspends all threads in this thread group.
*
- * First, the checkAccess method of this thread group is
+ * First, the {@code checkAccess} method of this thread group is
* called with no arguments; this may result in a security exception.
*
- * This method then calls the suspend method on all the
+ * This method then calls the {@code suspend} method on all the
* threads in this thread group and in all of its subgroups.
*
- * @exception SecurityException if the current thread is not allowed
+ * @throws SecurityException if the current thread is not allowed
* to access this thread group or any of the threads in
* the thread group.
* @see java.lang.Thread#suspend()
@@ -712,13 +712,13 @@ class ThreadGroup implements Thread.UncaughtExceptionHandler {
/**
* Resumes all threads in this thread group.
*
- * First, the checkAccess method of this thread group is
+ * First, the {@code checkAccess} method of this thread group is
* called with no arguments; this may result in a security exception.
*
- * This method then calls the resume method on all the
+ * This method then calls the {@code resume} method on all the
* threads in this thread group and in all of its sub groups.
*
- * @exception SecurityException if the current thread is not allowed to
+ * @throws SecurityException if the current thread is not allowed to
* access this thread group or any of the threads in the
* thread group.
* @see java.lang.SecurityException
@@ -757,12 +757,12 @@ class ThreadGroup implements Thread.UncaughtExceptionHandler {
* group must be empty, indicating that all threads that had been in
* this thread group have since stopped.
*
- * First, the checkAccess method of this thread group is
+ * First, the {@code checkAccess} method of this thread group is
* called with no arguments; this may result in a security exception.
*
- * @exception IllegalThreadStateException if the thread group is not
+ * @throws IllegalThreadStateException if the thread group is not
* empty or if the thread group has already been destroyed.
- * @exception SecurityException if the current thread cannot modify this
+ * @throws SecurityException if the current thread cannot modify this
* thread group.
* @see java.lang.ThreadGroup#checkAccess()
* @since 1.0
@@ -800,7 +800,7 @@ class ThreadGroup implements Thread.UncaughtExceptionHandler {
/**
* Adds the specified Thread group to this group.
* @param g the specified Thread group to be added
- * @exception IllegalThreadStateException If the Thread group has been destroyed.
+ * @throws IllegalThreadStateException If the Thread group has been destroyed.
*/
private final void add(ThreadGroup g){
synchronized (this) {
@@ -878,7 +878,7 @@ class ThreadGroup implements Thread.UncaughtExceptionHandler {
* @param t
* the Thread to be added
*
- * @throws IllegalThreadStateException
+ * @throws IllegalThreadStateException
* if the Thread group has been destroyed
*/
void add(Thread t) {
@@ -1016,29 +1016,29 @@ class ThreadGroup implements Thread.UncaughtExceptionHandler {
* does not have a specific {@link Thread.UncaughtExceptionHandler}
* installed.
*
- * The uncaughtException method of
- * ThreadGroup does the following:
+ * The {@code uncaughtException} method of
+ * {@code ThreadGroup} does the following:
*
* - If this thread group has a parent thread group, the
- *
uncaughtException method of that parent is called
+ * {@code uncaughtException} method of that parent is called
* with the same two arguments.
* - Otherwise, this method checks to see if there is a
* {@linkplain Thread#getDefaultUncaughtExceptionHandler default
* uncaught exception handler} installed, and if so, its
- *
uncaughtException method is called with the same
+ * {@code uncaughtException} method is called with the same
* two arguments.
- * - Otherwise, this method determines if the
Throwable
+ * - Otherwise, this method determines if the {@code Throwable}
* argument is an instance of {@link ThreadDeath}. If so, nothing
* special is done. Otherwise, a message containing the
* thread's name, as returned from the thread's {@link
* Thread#getName getName} method, and a stack backtrace,
- * using the
Throwable's {@link
+ * using the {@code Throwable}'s {@link
* Throwable#printStackTrace printStackTrace} method, is
* printed to the {@linkplain System#err standard error stream}.
*
*
* Applications can override this method in subclasses of
- * ThreadGroup to provide alternative handling of
+ * {@code ThreadGroup} to provide alternative handling of
* uncaught exceptions.
*
* @param t the thread that is about to exit.
diff --git a/src/java.base/share/classes/java/lang/invoke/ConstantBootstraps.java b/src/java.base/share/classes/java/lang/invoke/ConstantBootstraps.java
index 0392959f73a..f8db8990a90 100644
--- a/src/java.base/share/classes/java/lang/invoke/ConstantBootstraps.java
+++ b/src/java.base/share/classes/java/lang/invoke/ConstantBootstraps.java
@@ -104,10 +104,10 @@ public final class ConstantBootstraps {
*
* @param lookup the lookup context describing the class performing the
* operation (normally stacked by the JVM)
- * @param type the {@code Class} object describing the enum type for which
- * a constant is to be returned
* @param name the name of the constant to return, which must exactly match
* an enum constant in the specified type.
+ * @param type the {@code Class} object describing the enum type for which
+ * a constant is to be returned
* @param The enum type for which a constant value is to be returned
* @return the enum constant of the specified enum type with the
* specified name
@@ -208,20 +208,25 @@ public final class ConstantBootstraps {
/**
* Returns the result of invoking a method handle with the provided
* arguments.
+ *
+ * This method behaves as if the method handle to be invoked is the result
+ * of adapting the given method handle, via {@link MethodHandle#asType}, to
+ * adjust the return type to the desired type.
*
* @param lookup unused
* @param name unused
- * @param type the type of the value to be returned, which must be
+ * @param type the desired type of the value to be returned, which must be
* compatible with the return type of the method handle
* @param handle the method handle to be invoked
* @param args the arguments to pass to the method handle, as if with
* {@link MethodHandle#invokeWithArguments}. Each argument may be
* {@code null}.
* @return the result of invoking the method handle
- * @throws WrongMethodTypeException if the handle's return type cannot be
- * adjusted to the desired type
- * @throws ClassCastException if an argument cannot be converted by
- * reference casting
+ * @throws WrongMethodTypeException if the handle's method type cannot be
+ * adjusted to take the given number of arguments, or if the handle's return
+ * type cannot be adjusted to the desired type
+ * @throws ClassCastException if an argument or the result produced by
+ * invoking the handle cannot be converted by reference casting
* @throws Throwable anything thrown by the method handle invocation
*/
public static Object invoke(MethodHandles.Lookup lookup, String name, Class type,
diff --git a/src/java.base/share/classes/java/lang/invoke/GenerateJLIClassesHelper.java b/src/java.base/share/classes/java/lang/invoke/GenerateJLIClassesHelper.java
index b0af88804d6..45cc6899a91 100644
--- a/src/java.base/share/classes/java/lang/invoke/GenerateJLIClassesHelper.java
+++ b/src/java.base/share/classes/java/lang/invoke/GenerateJLIClassesHelper.java
@@ -133,7 +133,7 @@ class GenerateJLIClassesHelper {
}
static byte[] generateInvokersHolderClassBytes(String className,
- MethodType[] methodTypes) {
+ MethodType[] invokerMethodTypes, MethodType[] callSiteMethodTypes) {
HashSet dedupSet = new HashSet<>();
ArrayList forms = new ArrayList<>();
@@ -144,17 +144,33 @@ class GenerateJLIClassesHelper {
MethodTypeForm.LF_GEN_LINKER,
MethodTypeForm.LF_GEN_INVOKER
};
- for (int i = 0; i < methodTypes.length; i++) {
+
+ for (int i = 0; i < invokerMethodTypes.length; i++) {
// generate methods representing invokers of the specified type
- if (dedupSet.add(methodTypes[i])) {
+ if (dedupSet.add(invokerMethodTypes[i])) {
for (int type : types) {
- LambdaForm invokerForm = Invokers.invokeHandleForm(methodTypes[i],
+ LambdaForm invokerForm = Invokers.invokeHandleForm(invokerMethodTypes[i],
/*customized*/false, type);
forms.add(invokerForm);
names.add(invokerForm.kind.defaultLambdaName);
}
}
}
+
+ dedupSet = new HashSet<>();
+ for (int i = 0; i < callSiteMethodTypes.length; i++) {
+ // generate methods representing invokers of the specified type
+ if (dedupSet.add(callSiteMethodTypes[i])) {
+ LambdaForm callSiteForm = Invokers.callSiteForm(callSiteMethodTypes[i], true);
+ forms.add(callSiteForm);
+ names.add(callSiteForm.kind.defaultLambdaName);
+
+ LambdaForm methodHandleForm = Invokers.callSiteForm(callSiteMethodTypes[i], false);
+ forms.add(methodHandleForm);
+ names.add(methodHandleForm.kind.defaultLambdaName);
+ }
+ }
+
return generateCodeBytesForLFs(className,
names.toArray(new String[0]),
forms.toArray(new LambdaForm[0]));
diff --git a/src/java.base/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java b/src/java.base/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java
index 5813b72b008..c37ba71b2a0 100644
--- a/src/java.base/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java
+++ b/src/java.base/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java
@@ -649,6 +649,8 @@ class InvokerBytecodeGenerator {
}
case EXACT_INVOKER: // fall-through
case EXACT_LINKER: // fall-through
+ case LINK_TO_CALL_SITE: // fall-through
+ case LINK_TO_TARGET_METHOD: // fall-through
case GENERIC_INVOKER: // fall-through
case GENERIC_LINKER: return resolveFrom(name, invokerType.basicType(), Invokers.Holder.class);
case GET_OBJECT: // fall-through
@@ -669,6 +671,7 @@ class InvokerBytecodeGenerator {
case PUT_LONG: // fall-through
case PUT_FLOAT: // fall-through
case PUT_DOUBLE: // fall-through
+ case DIRECT_NEW_INVOKE_SPECIAL: // fall-through
case DIRECT_INVOKE_INTERFACE: // fall-through
case DIRECT_INVOKE_SPECIAL: // fall-through
case DIRECT_INVOKE_STATIC: // fall-through
@@ -1864,13 +1867,11 @@ class InvokerBytecodeGenerator {
* Emit a bogus method that just loads some string constants. This is to get the constants into the constant pool
* for debugging purposes.
*/
- private void bogusMethod(Object... os) {
+ private void bogusMethod(Object os) {
if (DUMP_CLASS_FILES) {
mv = cw.visitMethod(Opcodes.ACC_STATIC, "dummy", "()V", null, null);
- for (Object o : os) {
- mv.visitLdcInsn(o.toString());
- mv.visitInsn(Opcodes.POP);
- }
+ mv.visitLdcInsn(os.toString());
+ mv.visitInsn(Opcodes.POP);
mv.visitInsn(Opcodes.RETURN);
mv.visitMaxs(0, 0);
mv.visitEnd();
diff --git a/src/java.base/share/classes/java/lang/invoke/Invokers.java b/src/java.base/share/classes/java/lang/invoke/Invokers.java
index ba8cd72ef84..2eb40b2c4bc 100644
--- a/src/java.base/share/classes/java/lang/invoke/Invokers.java
+++ b/src/java.base/share/classes/java/lang/invoke/Invokers.java
@@ -523,7 +523,7 @@ class Invokers {
}
// skipCallSite is true if we are optimizing a ConstantCallSite
- private static LambdaForm callSiteForm(MethodType mtype, boolean skipCallSite) {
+ static LambdaForm callSiteForm(MethodType mtype, boolean skipCallSite) {
mtype = mtype.basicType(); // normalize Z to I, String to Object, etc.
final int which = (skipCallSite ? MethodTypeForm.LF_MH_LINKER : MethodTypeForm.LF_CS_LINKER);
LambdaForm lform = mtype.form().cachedLambdaForm(which);
diff --git a/src/java.base/share/classes/java/lang/invoke/MethodHandleImpl.java b/src/java.base/share/classes/java/lang/invoke/MethodHandleImpl.java
index f5ba966e5a8..4ea9e5640f7 100644
--- a/src/java.base/share/classes/java/lang/invoke/MethodHandleImpl.java
+++ b/src/java.base/share/classes/java/lang/invoke/MethodHandleImpl.java
@@ -1841,10 +1841,13 @@ import static jdk.internal.org.objectweb.asm.Opcodes.*;
@Override
public byte[] generateInvokersHolderClassBytes(final String className,
- MethodType[] methodTypes) {
+ MethodType[] invokerMethodTypes,
+ MethodType[] callSiteMethodTypes) {
return GenerateJLIClassesHelper
- .generateInvokersHolderClassBytes(className, methodTypes);
+ .generateInvokersHolderClassBytes(className,
+ invokerMethodTypes, callSiteMethodTypes);
}
+
});
}
diff --git a/src/java.base/share/classes/java/lang/invoke/ProxyClassesDumper.java b/src/java.base/share/classes/java/lang/invoke/ProxyClassesDumper.java
index 3f143765925..2737bd5a4bf 100644
--- a/src/java.base/share/classes/java/lang/invoke/ProxyClassesDumper.java
+++ b/src/java.base/share/classes/java/lang/invoke/ProxyClassesDumper.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2018, 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
@@ -30,7 +30,6 @@ import java.io.FilePermission;
import java.nio.file.Files;
import java.nio.file.InvalidPathException;
import java.nio.file.Path;
-import java.nio.file.Paths;
import java.security.AccessController;
import java.security.PrivilegedAction;
import java.util.Objects;
@@ -63,7 +62,7 @@ final class ProxyClassesDumper {
}
try {
path = path.trim();
- final Path dir = Paths.get(path.length() == 0 ? "." : path);
+ final Path dir = Path.of(path.length() == 0 ? "." : path);
AccessController.doPrivileged(new PrivilegedAction<>() {
@Override
public Void run() {
diff --git a/src/java.base/share/classes/java/lang/ref/Reference.java b/src/java.base/share/classes/java/lang/ref/Reference.java
index 042eb474b45..4fdeb452c78 100644
--- a/src/java.base/share/classes/java/lang/ref/Reference.java
+++ b/src/java.base/share/classes/java/lang/ref/Reference.java
@@ -25,7 +25,7 @@
package java.lang.ref;
-import jdk.internal.vm.annotation.DontInline;
+import jdk.internal.vm.annotation.ForceInline;
import jdk.internal.HotSpotIntrinsicCandidate;
import jdk.internal.misc.JavaLangRefAccess;
import jdk.internal.misc.SharedSecrets;
@@ -420,10 +420,12 @@ public abstract class Reference {
* @param ref the reference. If {@code null}, this method has no effect.
* @since 9
*/
- @DontInline
+ @ForceInline
public static void reachabilityFence(Object ref) {
- // Does nothing, because this method is annotated with @DontInline
- // HotSpot needs to retain the ref and not GC it before a call to this
- // method
+ // Does nothing. This method is annotated with @ForceInline to eliminate
+ // most of the overhead that using @DontInline would cause with the
+ // HotSpot JVM, when this fence is used in a wide variety of situations.
+ // HotSpot JVM retains the ref and does not GC it before a call to
+ // this method, because the JIT-compilers do not have GC-only safepoints.
}
}
diff --git a/src/java.base/share/classes/java/lang/reflect/Constructor.java b/src/java.base/share/classes/java/lang/reflect/Constructor.java
index a519d7feaf4..94944319829 100644
--- a/src/java.base/share/classes/java/lang/reflect/Constructor.java
+++ b/src/java.base/share/classes/java/lang/reflect/Constructor.java
@@ -253,6 +253,11 @@ public final class Constructor extends Executable {
return parameterTypes;
}
+ @Override
+ Class[] getSharedExceptionTypes() {
+ return exceptionTypes;
+ }
+
/**
* {@inheritDoc}
*/
diff --git a/src/java.base/share/classes/java/lang/reflect/Executable.java b/src/java.base/share/classes/java/lang/reflect/Executable.java
index 70e52b3505c..9d6cfca8d7d 100644
--- a/src/java.base/share/classes/java/lang/reflect/Executable.java
+++ b/src/java.base/share/classes/java/lang/reflect/Executable.java
@@ -226,6 +226,10 @@ public abstract class Executable extends AccessibleObject
// to the untrusted code...
abstract Class[] getSharedParameterTypes();
+ // returns shared array of exception types - must never give it out
+ // to the untrusted code...
+ abstract Class[] getSharedExceptionTypes();
+
/**
* Returns an array of {@code Class} objects that represent the formal
* parameter types, in declaration order, of the executable
diff --git a/src/java.base/share/classes/java/lang/reflect/Method.java b/src/java.base/share/classes/java/lang/reflect/Method.java
index 026750cdce9..2c134cb2dcb 100644
--- a/src/java.base/share/classes/java/lang/reflect/Method.java
+++ b/src/java.base/share/classes/java/lang/reflect/Method.java
@@ -301,6 +301,11 @@ public final class Method extends Executable {
return parameterTypes;
}
+ @Override
+ Class[] getSharedExceptionTypes() {
+ return exceptionTypes;
+ }
+
/**
* {@inheritDoc}
*/
diff --git a/src/java.base/share/classes/java/lang/reflect/Proxy.java b/src/java.base/share/classes/java/lang/reflect/Proxy.java
index 74c700f18ed..27d33a83d17 100644
--- a/src/java.base/share/classes/java/lang/reflect/Proxy.java
+++ b/src/java.base/share/classes/java/lang/reflect/Proxy.java
@@ -708,24 +708,32 @@ public class Proxy implements java.io.Serializable {
*/
private static Set> referencedTypes(ClassLoader loader,
List> interfaces) {
- return interfaces.stream()
- .flatMap(intf -> Stream.of(intf.getMethods())
- .filter(m -> !Modifier.isStatic(m.getModifiers()))
- .flatMap(ProxyBuilder::methodRefTypes)
- .map(ProxyBuilder::getElementType)
- .filter(t -> !t.isPrimitive()))
- .collect(Collectors.toSet());
+ var types = new HashSet>();
+ for (var intf : interfaces) {
+ for (Method m : intf.getMethods()) {
+ if (!Modifier.isStatic(m.getModifiers())) {
+ addElementType(types, m.getReturnType());
+ addElementTypes(types, m.getSharedParameterTypes());
+ addElementTypes(types, m.getSharedExceptionTypes());
+ }
+ }
+ }
+ return types;
}
- /*
- * Extracts all types referenced on a method signature including
- * its return type, parameter types, and exception types.
- */
- private static Stream> methodRefTypes(Method m) {
- return Stream.of(new Class[] { m.getReturnType() },
- m.getParameterTypes(),
- m.getExceptionTypes())
- .flatMap(Stream::of);
+ private static void addElementTypes(HashSet> types,
+ Class ... classes) {
+ for (var cls : classes) {
+ addElementType(types, cls);
+ }
+ }
+
+ private static void addElementType(HashSet> types,
+ Class cls) {
+ var type = getElementType(cls);
+ if (!type.isPrimitive()) {
+ types.add(type);
+ }
}
/**
diff --git a/src/java.base/share/classes/java/lang/reflect/ProxyGenerator.java b/src/java.base/share/classes/java/lang/reflect/ProxyGenerator.java
index cc8dbbfffab..a12c057c784 100644
--- a/src/java.base/share/classes/java/lang/reflect/ProxyGenerator.java
+++ b/src/java.base/share/classes/java/lang/reflect/ProxyGenerator.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2018, 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
@@ -34,7 +34,6 @@ import java.lang.reflect.Array;
import java.lang.reflect.Method;
import java.nio.file.Files;
import java.nio.file.Path;
-import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.LinkedList;
@@ -346,11 +345,11 @@ class ProxyGenerator {
int i = name.lastIndexOf('.');
Path path;
if (i > 0) {
- Path dir = Paths.get(name.substring(0, i).replace('.', File.separatorChar));
+ Path dir = Path.of(name.substring(0, i).replace('.', File.separatorChar));
Files.createDirectories(dir);
path = dir.resolve(name.substring(i+1, name.length()) + ".class");
} else {
- path = Paths.get(name + ".class");
+ path = Path.of(name + ".class");
}
Files.write(path, classFile);
return null;
@@ -449,7 +448,9 @@ class ProxyGenerator {
*/
for (Class intf : interfaces) {
for (Method m : intf.getMethods()) {
- addProxyMethod(m, intf);
+ if (!Modifier.isStatic(m.getModifiers())) {
+ addProxyMethod(m, intf);
+ }
}
}
@@ -1724,7 +1725,7 @@ class ProxyGenerator {
* This map is used to look up the index of an existing entry for
* values of all types.
*/
- private Map map = new HashMap<>(16);
+ private Map map = new HashMap<>(16);
/** true if no new constant pool entries may be added */
private boolean readOnly = false;
@@ -1876,7 +1877,7 @@ class ProxyGenerator {
* java.lang.Double CONSTANT_DOUBLE
*/
private short getValue(Object key) {
- Short index = map.get(key);
+ Integer index = map.get(key);
if (index != null) {
return index.shortValue();
} else {
@@ -1885,7 +1886,7 @@ class ProxyGenerator {
"late constant pool addition: " + key);
}
short i = addEntry(new ValueEntry(key));
- map.put(key, i);
+ map.put(key, (int)i);
return i;
}
}
@@ -1895,7 +1896,7 @@ class ProxyGenerator {
* references to other constant pool entries.
*/
private short getIndirect(IndirectEntry e) {
- Short index = map.get(e);
+ Integer index = map.get(e);
if (index != null) {
return index.shortValue();
} else {
@@ -1903,7 +1904,7 @@ class ProxyGenerator {
throw new InternalError("late constant pool addition");
}
short i = addEntry(e);
- map.put(e, i);
+ map.put(e, (int)i);
return i;
}
}
diff --git a/src/java.base/share/classes/java/math/BigInteger.java b/src/java.base/share/classes/java/math/BigInteger.java
index 992b8dbb944..0391f7c323f 100644
--- a/src/java.base/share/classes/java/math/BigInteger.java
+++ b/src/java.base/share/classes/java/math/BigInteger.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2018, 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
@@ -3556,8 +3556,8 @@ public class BigInteger extends Number implements Comparable {
* Returns the number of bits in the minimal two's-complement
* representation of this BigInteger, excluding a sign bit.
* For positive BigIntegers, this is equivalent to the number of bits in
- * the ordinary binary representation. (Computes
- * {@code (ceil(log2(this < 0 ? -this : this+1)))}.)
+ * the ordinary binary representation. For zero this method returns
+ * {@code 0}. (Computes {@code (ceil(log2(this < 0 ? -this : this+1)))}.)
*
* @return number of bits in the minimal two's-complement
* representation of this BigInteger, excluding a sign bit.
diff --git a/src/java.base/share/classes/java/net/AbstractPlainSocketImpl.java b/src/java.base/share/classes/java/net/AbstractPlainSocketImpl.java
index f66eda1c721..0a8248bb630 100644
--- a/src/java.base/share/classes/java/net/AbstractPlainSocketImpl.java
+++ b/src/java.base/share/classes/java/net/AbstractPlainSocketImpl.java
@@ -45,8 +45,7 @@ import sun.net.ResourceManager;
*
* @author Steven B. Byrne
*/
-abstract class AbstractPlainSocketImpl extends SocketImpl
-{
+abstract class AbstractPlainSocketImpl extends SocketImpl {
/* instance variable for SO_TIMEOUT */
int timeout; // timeout in millisec
// traffic class
@@ -68,11 +67,7 @@ abstract class AbstractPlainSocketImpl extends SocketImpl
protected boolean closePending = false;
/* indicates connection reset state */
- private int CONNECTION_NOT_RESET = 0;
- private int CONNECTION_RESET_PENDING = 1;
- private int CONNECTION_RESET = 2;
- private int resetState;
- private final Object resetLock = new Object();
+ private volatile boolean connectionReset;
/* whether this Socket is a stream (TCP) socket or not (UDP)
*/
@@ -541,18 +536,8 @@ abstract class AbstractPlainSocketImpl extends SocketImpl
int n = 0;
try {
n = socketAvailable();
- if (n == 0 && isConnectionResetPending()) {
- setConnectionReset();
- }
} catch (ConnectionResetException exc1) {
- setConnectionResetPending();
- try {
- n = socketAvailable();
- if (n == 0) {
- setConnectionReset();
- }
- } catch (ConnectionResetException exc2) {
- }
+ setConnectionReset();
}
return n;
}
@@ -680,31 +665,12 @@ abstract class AbstractPlainSocketImpl extends SocketImpl
}
}
- public boolean isConnectionReset() {
- synchronized (resetLock) {
- return (resetState == CONNECTION_RESET);
- }
+ boolean isConnectionReset() {
+ return connectionReset;
}
- public boolean isConnectionResetPending() {
- synchronized (resetLock) {
- return (resetState == CONNECTION_RESET_PENDING);
- }
- }
-
- public void setConnectionReset() {
- synchronized (resetLock) {
- resetState = CONNECTION_RESET;
- }
- }
-
- public void setConnectionResetPending() {
- synchronized (resetLock) {
- if (resetState == CONNECTION_NOT_RESET) {
- resetState = CONNECTION_RESET_PENDING;
- }
- }
-
+ void setConnectionReset() {
+ connectionReset = true;
}
/*
diff --git a/src/java.base/share/classes/java/net/SocketInputStream.java b/src/java.base/share/classes/java/net/SocketInputStream.java
index bb3481b7164..c4dbb5d59dd 100644
--- a/src/java.base/share/classes/java/net/SocketInputStream.java
+++ b/src/java.base/share/classes/java/net/SocketInputStream.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1995, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2018, 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
@@ -40,8 +40,7 @@ import sun.net.ConnectionResetException;
* @author Jonathan Payne
* @author Arthur van Hoff
*/
-class SocketInputStream extends FileInputStream
-{
+class SocketInputStream extends FileInputStream {
static {
init();
}
@@ -163,8 +162,6 @@ class SocketInputStream extends FileInputStream
+ " off == " + off + " buffer length == " + b.length);
}
- boolean gotReset = false;
-
// acquire file descriptor and do the read
FileDescriptor fd = impl.acquireFD();
try {
@@ -173,29 +170,11 @@ class SocketInputStream extends FileInputStream
return n;
}
} catch (ConnectionResetException rstExc) {
- gotReset = true;
+ impl.setConnectionReset();
} finally {
impl.releaseFD();
}
- /*
- * We receive a "connection reset" but there may be bytes still
- * buffered on the socket
- */
- if (gotReset) {
- impl.setConnectionResetPending();
- impl.acquireFD();
- try {
- n = socketRead(fd, b, off, length, timeout);
- if (n > 0) {
- return n;
- }
- } catch (ConnectionResetException rstExc) {
- } finally {
- impl.releaseFD();
- }
- }
-
/*
* If we get here we are at EOF, the socket has been closed,
* or the connection has been reset.
@@ -203,9 +182,6 @@ class SocketInputStream extends FileInputStream
if (impl.isClosedOrPending()) {
throw new SocketException("Socket closed");
}
- if (impl.isConnectionResetPending()) {
- impl.setConnectionReset();
- }
if (impl.isConnectionReset()) {
throw new SocketException("Connection reset");
}
diff --git a/src/java.base/share/classes/java/net/SocketOutputStream.java b/src/java.base/share/classes/java/net/SocketOutputStream.java
index ddf3dcf9bb5..39f03e57446 100644
--- a/src/java.base/share/classes/java/net/SocketOutputStream.java
+++ b/src/java.base/share/classes/java/net/SocketOutputStream.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1995, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2018, 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
@@ -38,8 +38,7 @@ import java.nio.channels.FileChannel;
* @author Jonathan Payne
* @author Arthur van Hoff
*/
-class SocketOutputStream extends FileOutputStream
-{
+class SocketOutputStream extends FileOutputStream {
static {
init();
}
@@ -111,7 +110,7 @@ class SocketOutputStream extends FileOutputStream
socketWrite0(fd, b, off, len);
} catch (SocketException se) {
if (se instanceof sun.net.ConnectionResetException) {
- impl.setConnectionResetPending();
+ impl.setConnectionReset();
se = new SocketException("Connection reset");
}
if (impl.isClosedOrPending()) {
diff --git a/src/java.base/share/classes/java/nio/Direct-X-Buffer-bin.java.template b/src/java.base/share/classes/java/nio/Direct-X-Buffer-bin.java.template
index cacadb101df..a6fed522fa4 100644
--- a/src/java.base/share/classes/java/nio/Direct-X-Buffer-bin.java.template
+++ b/src/java.base/share/classes/java/nio/Direct-X-Buffer-bin.java.template
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2018, 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
@@ -32,24 +32,40 @@ class XXX {
#if[rw]
private $type$ get$Type$(long a) {
- $memtype$ x = UNSAFE.get$Memtype$Unaligned(null, a, bigEndian);
- return $fromBits$(x);
+ try {
+ $memtype$ x = UNSAFE.get$Memtype$Unaligned(null, a, bigEndian);
+ return $fromBits$(x);
+ } finally {
+ Reference.reachabilityFence(this);
+ }
}
public $type$ get$Type$() {
- return get$Type$(ix(nextGetIndex($BYTES_PER_VALUE$)));
+ try {
+ return get$Type$(ix(nextGetIndex($BYTES_PER_VALUE$)));
+ } finally {
+ Reference.reachabilityFence(this);
+ }
}
public $type$ get$Type$(int i) {
- return get$Type$(ix(checkIndex(i, $BYTES_PER_VALUE$)));
+ try {
+ return get$Type$(ix(checkIndex(i, $BYTES_PER_VALUE$)));
+ } finally {
+ Reference.reachabilityFence(this);
+ }
}
#end[rw]
private ByteBuffer put$Type$(long a, $type$ x) {
#if[rw]
- $memtype$ y = $toBits$(x);
- UNSAFE.put$Memtype$Unaligned(null, a, y, bigEndian);
+ try {
+ $memtype$ y = $toBits$(x);
+ UNSAFE.put$Memtype$Unaligned(null, a, y, bigEndian);
+ } finally {
+ Reference.reachabilityFence(this);
+ }
return this;
#else[rw]
throw new ReadOnlyBufferException();
diff --git a/src/java.base/share/classes/java/nio/Direct-X-Buffer.java.template b/src/java.base/share/classes/java/nio/Direct-X-Buffer.java.template
index 5fa9be47b20..fc4582995e5 100644
--- a/src/java.base/share/classes/java/nio/Direct-X-Buffer.java.template
+++ b/src/java.base/share/classes/java/nio/Direct-X-Buffer.java.template
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2018, 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
@@ -28,6 +28,7 @@
package java.nio;
import java.io.FileDescriptor;
+import java.lang.ref.Reference;
import jdk.internal.misc.VM;
import jdk.internal.ref.Cleaner;
import sun.nio.ch.DirectBuffer;
@@ -257,16 +258,28 @@ class Direct$Type$Buffer$RW$$BO$
}
public $type$ get() {
- return $fromBits$($swap$(UNSAFE.get$Swaptype$(ix(nextGetIndex()))));
+ try {
+ return $fromBits$($swap$(UNSAFE.get$Swaptype$(ix(nextGetIndex()))));
+ } finally {
+ Reference.reachabilityFence(this);
+ }
}
public $type$ get(int i) {
- return $fromBits$($swap$(UNSAFE.get$Swaptype$(ix(checkIndex(i)))));
+ try {
+ return $fromBits$($swap$(UNSAFE.get$Swaptype$(ix(checkIndex(i)))));
+ } finally {
+ Reference.reachabilityFence(this);
+ }
}
#if[streamableType]
$type$ getUnchecked(int i) {
- return $fromBits$($swap$(UNSAFE.get$Swaptype$(ix(i))));
+ try {
+ return $fromBits$($swap$(UNSAFE.get$Swaptype$(ix(i))));
+ } finally {
+ Reference.reachabilityFence(this);
+ }
}
#end[streamableType]
@@ -282,21 +295,25 @@ class Direct$Type$Buffer$RW$$BO$
throw new BufferUnderflowException();
long dstOffset = ARRAY_BASE_OFFSET + ((long)offset << $LG_BYTES_PER_VALUE$);
+ try {
#if[!byte]
- if (order() != ByteOrder.nativeOrder())
- UNSAFE.copySwapMemory(null,
+ if (order() != ByteOrder.nativeOrder())
+ UNSAFE.copySwapMemory(null,
+ ix(pos),
+ dst,
+ dstOffset,
+ (long)length << $LG_BYTES_PER_VALUE$,
+ (long)1 << $LG_BYTES_PER_VALUE$);
+ else
+#end[!byte]
+ UNSAFE.copyMemory(null,
ix(pos),
dst,
dstOffset,
- (long)length << $LG_BYTES_PER_VALUE$,
- (long)1 << $LG_BYTES_PER_VALUE$);
- else
-#end[!byte]
- UNSAFE.copyMemory(null,
- ix(pos),
- dst,
- dstOffset,
- (long)length << $LG_BYTES_PER_VALUE$);
+ (long)length << $LG_BYTES_PER_VALUE$);
+ } finally {
+ Reference.reachabilityFence(this);
+ }
position(pos + length);
} else {
super.get(dst, offset, length);
@@ -311,7 +328,11 @@ class Direct$Type$Buffer$RW$$BO$
public $Type$Buffer put($type$ x) {
#if[rw]
- UNSAFE.put$Swaptype$(ix(nextPutIndex()), $swap$($toBits$(x)));
+ try {
+ UNSAFE.put$Swaptype$(ix(nextPutIndex()), $swap$($toBits$(x)));
+ } finally {
+ Reference.reachabilityFence(this);
+ }
return this;
#else[rw]
throw new ReadOnlyBufferException();
@@ -320,7 +341,11 @@ class Direct$Type$Buffer$RW$$BO$
public $Type$Buffer put(int i, $type$ x) {
#if[rw]
- UNSAFE.put$Swaptype$(ix(checkIndex(i)), $swap$($toBits$(x)));
+ try {
+ UNSAFE.put$Swaptype$(ix(checkIndex(i)), $swap$($toBits$(x)));
+ } finally {
+ Reference.reachabilityFence(this);
+ }
return this;
#else[rw]
throw new ReadOnlyBufferException();
@@ -346,7 +371,12 @@ class Direct$Type$Buffer$RW$$BO$
if (srem > rem)
throw new BufferOverflowException();
- UNSAFE.copyMemory(sb.ix(spos), ix(pos), (long)srem << $LG_BYTES_PER_VALUE$);
+ try {
+ UNSAFE.copyMemory(sb.ix(spos), ix(pos), (long)srem << $LG_BYTES_PER_VALUE$);
+ } finally {
+ Reference.reachabilityFence(sb);
+ Reference.reachabilityFence(this);
+ }
sb.position(spos + srem);
position(pos + srem);
} else if (src.hb != null) {
@@ -380,21 +410,25 @@ class Direct$Type$Buffer$RW$$BO$
throw new BufferOverflowException();
long srcOffset = ARRAY_BASE_OFFSET + ((long)offset << $LG_BYTES_PER_VALUE$);
+ try {
#if[!byte]
- if (order() != ByteOrder.nativeOrder())
- UNSAFE.copySwapMemory(src,
+ if (order() != ByteOrder.nativeOrder())
+ UNSAFE.copySwapMemory(src,
+ srcOffset,
+ null,
+ ix(pos),
+ (long)length << $LG_BYTES_PER_VALUE$,
+ (long)1 << $LG_BYTES_PER_VALUE$);
+ else
+#end[!byte]
+ UNSAFE.copyMemory(src,
srcOffset,
null,
ix(pos),
- (long)length << $LG_BYTES_PER_VALUE$,
- (long)1 << $LG_BYTES_PER_VALUE$);
- else
-#end[!byte]
- UNSAFE.copyMemory(src,
- srcOffset,
- null,
- ix(pos),
- (long)length << $LG_BYTES_PER_VALUE$);
+ (long)length << $LG_BYTES_PER_VALUE$);
+ } finally {
+ Reference.reachabilityFence(this);
+ }
position(pos + length);
} else {
super.put(src, offset, length);
@@ -411,8 +445,11 @@ class Direct$Type$Buffer$RW$$BO$
int lim = limit();
assert (pos <= lim);
int rem = (pos <= lim ? lim - pos : 0);
-
- UNSAFE.copyMemory(ix(pos), ix(0), (long)rem << $LG_BYTES_PER_VALUE$);
+ try {
+ UNSAFE.copyMemory(ix(pos), ix(0), (long)rem << $LG_BYTES_PER_VALUE$);
+ } finally {
+ Reference.reachabilityFence(this);
+ }
position(rem);
limit(capacity());
discardMark();
@@ -497,19 +534,6 @@ class Direct$Type$Buffer$RW$$BO$
#if[byte]
-
- byte _get(int i) { // package-private
- return UNSAFE.getByte(address + i);
- }
-
- void _put(int i, byte b) { // package-private
-#if[rw]
- UNSAFE.putByte(address + i, b);
-#else[rw]
- throw new ReadOnlyBufferException();
-#end[rw]
- }
-
// #BIN
//
// Binary-data access methods for short, char, int, long, float,
diff --git a/src/java.base/share/classes/java/nio/MappedByteBuffer.java b/src/java.base/share/classes/java/nio/MappedByteBuffer.java
index 2f84cbf4549..d9ead79c092 100644
--- a/src/java.base/share/classes/java/nio/MappedByteBuffer.java
+++ b/src/java.base/share/classes/java/nio/MappedByteBuffer.java
@@ -26,6 +26,7 @@
package java.nio;
import java.io.FileDescriptor;
+import java.lang.ref.Reference;
import jdk.internal.misc.Unsafe;
@@ -166,9 +167,15 @@ public abstract class MappedByteBuffer
int count = Bits.pageCount(length);
long a = mappingAddress(offset);
byte x = 0;
- for (int i=0; i= 0) {
- return Character.compare(this.get(this.position() + i), that.get(this.position() + i));
+ return Character.compare(this.get(this.position() + i), that.get(that.position() + i));
}
return this.remaining() - that.remaining();
}
diff --git a/src/java.base/share/classes/java/nio/X-Buffer.java.template b/src/java.base/share/classes/java/nio/X-Buffer.java.template
index 96e05d6a663..b59755b1fd5 100644
--- a/src/java.base/share/classes/java/nio/X-Buffer.java.template
+++ b/src/java.base/share/classes/java/nio/X-Buffer.java.template
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2018, 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
@@ -1337,7 +1337,7 @@ public abstract class $Type$Buffer
that, that.position(),
Math.min(this.remaining(), that.remaining()));
if (i >= 0) {
- return compare(this.get(this.position() + i), that.get(this.position() + i));
+ return compare(this.get(this.position() + i), that.get(that.position() + i));
}
return this.remaining() - that.remaining();
}
@@ -1749,11 +1749,6 @@ public abstract class $Type$Buffer
abstract ByteBuffer slice(int pos, int lim);
- // Unchecked accessors, for use by ByteBufferAs-X-Buffer classes
- //
- abstract byte _get(int i); // package-private
- abstract void _put(int i, byte b); // package-private
-
// #BIN
//
// Binary-data access methods for short, char, int, long, float,
diff --git a/src/java.base/share/classes/java/nio/channels/DatagramChannel.java b/src/java.base/share/classes/java/nio/channels/DatagramChannel.java
index 2aea82e1d34..c555c1e9a22 100644
--- a/src/java.base/share/classes/java/nio/channels/DatagramChannel.java
+++ b/src/java.base/share/classes/java/nio/channels/DatagramChannel.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2018, 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
@@ -279,6 +279,9 @@ public abstract class DatagramChannel
*
* @return This datagram channel
*
+ * @throws AlreadyConnectedException
+ * If this channel is already connected
+ *
* @throws ClosedChannelException
* If this channel is closed
*
@@ -292,6 +295,12 @@ public abstract class DatagramChannel
* closing the channel and setting the current thread's
* interrupt status
*
+ * @throws UnresolvedAddressException
+ * If the given remote address is not fully resolved
+ *
+ * @throws UnsupportedAddressTypeException
+ * If the type of the given remote address is not supported
+ *
* @throws SecurityException
* If a security manager has been installed
* and it does not permit access to the given remote address
@@ -444,6 +453,10 @@ public abstract class DatagramChannel
* zero if there was insufficient room for the datagram in the
* underlying output buffer
*
+ * @throws AlreadyConnectedException
+ * If this channel is connected to a different address
+ * from that specified by {@code target}
+ *
* @throws ClosedChannelException
* If this channel is closed
*
@@ -457,6 +470,12 @@ public abstract class DatagramChannel
* closing the channel and setting the current thread's
* interrupt status
*
+ * @throws UnresolvedAddressException
+ * If the given remote address is not fully resolved
+ *
+ * @throws UnsupportedAddressTypeException
+ * If the type of the given remote address is not supported
+ *
* @throws SecurityException
* If a security manager has been installed
* and it does not permit datagrams to be sent
diff --git a/src/java.base/share/classes/java/nio/charset/CoderResult.java b/src/java.base/share/classes/java/nio/charset/CoderResult.java
index e82300c2504..a260b5d3bba 100644
--- a/src/java.base/share/classes/java/nio/charset/CoderResult.java
+++ b/src/java.base/share/classes/java/nio/charset/CoderResult.java
@@ -25,8 +25,8 @@
package java.nio.charset;
-import java.lang.ref.WeakReference;
-import java.nio.*;
+import java.nio.BufferOverflowException;
+import java.nio.BufferUnderflowException;
import java.util.concurrent.ConcurrentHashMap;
import java.util.Map;
@@ -190,35 +190,14 @@ public class CoderResult {
public static final CoderResult OVERFLOW
= new CoderResult(CR_OVERFLOW, 0);
- private abstract static class Cache {
+ private static final class Cache {
+ static final Cache INSTANCE = new Cache();
+ private Cache() {}
- private Map> cache = null;
-
- protected abstract CoderResult create(int len);
-
- private CoderResult get(int len) {
- Integer k = len;
- WeakReference w;
- CoderResult e = null;
- if (cache == null) {
- cache = new ConcurrentHashMap<>();
- } else if ((w = cache.get(k)) != null) {
- e = w.get();
- }
- if (e == null) {
- e = create(len);
- cache.put(k, new WeakReference<>(e));
- }
- return e;
- }
+ final Map unmappable = new ConcurrentHashMap<>();
+ final Map malformed = new ConcurrentHashMap<>();
}
- private static final Cache malformedCache
- = new Cache() {
- public CoderResult create(int len) {
- return new CoderResult(CR_MALFORMED, len);
- }};
-
private static final CoderResult[] malformed4 = new CoderResult[] {
new CoderResult(CR_MALFORMED, 1),
new CoderResult(CR_MALFORMED, 2),
@@ -240,15 +219,10 @@ public class CoderResult {
throw new IllegalArgumentException("Non-positive length");
if (length <= 4)
return malformed4[length - 1];
- return malformedCache.get(length);
+ return Cache.INSTANCE.malformed.computeIfAbsent(length,
+ n -> new CoderResult(CR_MALFORMED, n));
}
- private static final Cache unmappableCache
- = new Cache() {
- public CoderResult create(int len) {
- return new CoderResult(CR_UNMAPPABLE, len);
- }};
-
private static final CoderResult[] unmappable4 = new CoderResult[] {
new CoderResult(CR_UNMAPPABLE, 1),
new CoderResult(CR_UNMAPPABLE, 2),
@@ -270,7 +244,8 @@ public class CoderResult {
throw new IllegalArgumentException("Non-positive length");
if (length <= 4)
return unmappable4[length - 1];
- return unmappableCache.get(length);
+ return Cache.INSTANCE.unmappable.computeIfAbsent(length,
+ n -> new CoderResult(CR_UNMAPPABLE, n));
}
/**
diff --git a/src/java.base/share/classes/java/nio/file/Path.java b/src/java.base/share/classes/java/nio/file/Path.java
index 76715a2225e..296c48d3e8c 100644
--- a/src/java.base/share/classes/java/nio/file/Path.java
+++ b/src/java.base/share/classes/java/nio/file/Path.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, 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
@@ -28,6 +28,7 @@ package java.nio.file;
import java.io.File;
import java.io.IOException;
import java.net.URI;
+import java.nio.file.spi.FileSystemProvider;
import java.util.Iterator;
import java.util.NoSuchElementException;
@@ -93,12 +94,124 @@ import java.util.NoSuchElementException;
* multiple concurrent threads.
*
* @since 1.7
- * @see Paths
*/
public interface Path
extends Comparable, Iterable, Watchable
{
+ /**
+ * Returns a {@code Path} by converting a path string, or a sequence of
+ * strings that when joined form a path string. If {@code more} does not
+ * specify any elements then the value of the {@code first} parameter is
+ * the path string to convert. If {@code more} specifies one or more
+ * elements then each non-empty string, including {@code first}, is
+ * considered to be a sequence of name elements and is joined to form a
+ * path string. The details as to how the Strings are joined is provider
+ * specific but typically they will be joined using the
+ * {@link FileSystem#getSeparator name-separator} as the separator.
+ * For example, if the name separator is "{@code /}" and
+ * {@code getPath("/foo","bar","gus")} is invoked, then the path string
+ * {@code "/foo/bar/gus"} is converted to a {@code Path}. A {@code Path}
+ * representing an empty path is returned if {@code first} is the empty
+ * string and {@code more} does not contain any non-empty strings.
+ *
+ * The {@code Path} is obtained by invoking the {@link FileSystem#getPath
+ * getPath} method of the {@link FileSystems#getDefault default} {@link
+ * FileSystem}.
+ *
+ *
Note that while this method is very convenient, using it will imply
+ * an assumed reference to the default {@code FileSystem} and limit the
+ * utility of the calling code. Hence it should not be used in library code
+ * intended for flexible reuse. A more flexible alternative is to use an
+ * existing {@code Path} instance as an anchor, such as:
+ *
{@code
+ * Path dir = ...
+ * Path path = dir.resolve("file");
+ * }
+ *
+ * @param first
+ * the path string or initial part of the path string
+ * @param more
+ * additional strings to be joined to form the path string
+ *
+ * @return the resulting {@code Path}
+ *
+ * @throws InvalidPathException
+ * if the path string cannot be converted to a {@code Path}
+ *
+ * @see FileSystem#getPath
+ *
+ * @since 11
+ */
+ public static Path of(String first, String... more) {
+ return FileSystems.getDefault().getPath(first, more);
+ }
+
+ /**
+ * Returns a {@code Path} by converting a URI.
+ *
+ * This method iterates over the {@link FileSystemProvider#installedProviders()
+ * installed} providers to locate the provider that is identified by the
+ * URI {@link URI#getScheme scheme} of the given URI. URI schemes are
+ * compared without regard to case. If the provider is found then its {@link
+ * FileSystemProvider#getPath getPath} method is invoked to convert the
+ * URI.
+ *
+ *
In the case of the default provider, identified by the URI scheme
+ * "file", the given URI has a non-empty path component, and undefined query
+ * and fragment components. Whether the authority component may be present
+ * is platform specific. The returned {@code Path} is associated with the
+ * {@link FileSystems#getDefault default} file system.
+ *
+ *
The default provider provides a similar round-trip guarantee
+ * to the {@link java.io.File} class. For a given {@code Path} p it
+ * is guaranteed that
+ *
{@code
+ * Path.of(}p{@code .}{@link Path#toUri() toUri}{@code ()).equals(}
+ * p{@code .}{@link Path#toAbsolutePath() toAbsolutePath}{@code ())}
+ *
+ * so long as the original {@code Path}, the {@code URI}, and the new {@code
+ * Path} are all created in (possibly different invocations of) the same
+ * Java virtual machine. Whether other providers make any guarantees is
+ * provider specific and therefore unspecified.
+ *
+ * @param uri
+ * the URI to convert
+ *
+ * @return the resulting {@code Path}
+ *
+ * @throws IllegalArgumentException
+ * if preconditions on the {@code uri} parameter do not hold. The
+ * format of the URI is provider specific.
+ * @throws FileSystemNotFoundException
+ * The file system, identified by the URI, does not exist and
+ * cannot be created automatically, or the provider identified by
+ * the URI's scheme component is not installed
+ * @throws SecurityException
+ * if a security manager is installed and it denies an unspecified
+ * permission to access the file system
+ *
+ * @since 11
+ */
+ public static Path of(URI uri) {
+ String scheme = uri.getScheme();
+ if (scheme == null)
+ throw new IllegalArgumentException("Missing scheme");
+
+ // check for default provider to avoid loading of installed providers
+ if (scheme.equalsIgnoreCase("file"))
+ return FileSystems.getDefault().provider().getPath(uri);
+
+ // try to find provider
+ for (FileSystemProvider provider: FileSystemProvider.installedProviders()) {
+ if (provider.getScheme().equalsIgnoreCase(scheme)) {
+ return provider.getPath(uri);
+ }
+ }
+
+ throw new FileSystemNotFoundException("Provider \"" + scheme + "\" not installed");
+ }
+
/**
* Returns the file system that created this object.
*
@@ -527,7 +640,7 @@ public interface Path
* to the {@link java.io.File} class. For a given {@code Path} p it
* is guaranteed that
*
- * {@link Paths#get(URI) Paths.get}{@code (}p{@code .toUri()).equals(}p
+ * {@link Path#of(URI) Path.of}{@code (}p{@code .toUri()).equals(}p
* {@code .}{@link #toAbsolutePath() toAbsolutePath}{@code ())}
*
* so long as the original {@code Path}, the {@code URI}, and the new {@code
diff --git a/src/java.base/share/classes/java/nio/file/Paths.java b/src/java.base/share/classes/java/nio/file/Paths.java
index 3f57aaf7cb8..4f177bac5c0 100644
--- a/src/java.base/share/classes/java/nio/file/Paths.java
+++ b/src/java.base/share/classes/java/nio/file/Paths.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, 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
@@ -32,7 +32,13 @@ import java.net.URI;
* This class consists exclusively of static methods that return a {@link Path}
* by converting a path string or {@link URI}.
*
+ * @apiNote
+ * It is recommended to obtain a {@code Path} via the {@code Path.of} methods
+ * instead of via the {@code get} methods defined in this class as this class
+ * may be deprecated in a future release.
+ *
* @since 1.7
+ * @see Path
*/
public final class Paths {
@@ -40,33 +46,11 @@ public final class Paths {
/**
* Converts a path string, or a sequence of strings that when joined form
- * a path string, to a {@code Path}. If {@code more} does not specify any
- * elements then the value of the {@code first} parameter is the path string
- * to convert. If {@code more} specifies one or more elements then each
- * non-empty string, including {@code first}, is considered to be a sequence
- * of name elements (see {@link Path}) and is joined to form a path string.
- * The details as to how the Strings are joined is provider specific but
- * typically they will be joined using the {@link FileSystem#getSeparator
- * name-separator} as the separator. For example, if the name separator is
- * "{@code /}" and {@code getPath("/foo","bar","gus")} is invoked, then the
- * path string {@code "/foo/bar/gus"} is converted to a {@code Path}.
- * A {@code Path} representing an empty path is returned if {@code first}
- * is the empty string and {@code more} does not contain any non-empty
- * strings.
+ * a path string, to a {@code Path}.
*
- * The {@code Path} is obtained by invoking the {@link FileSystem#getPath
- * getPath} method of the {@link FileSystems#getDefault default} {@link
- * FileSystem}.
- *
- *
Note that while this method is very convenient, using it will imply
- * an assumed reference to the default {@code FileSystem} and limit the
- * utility of the calling code. Hence it should not be used in library code
- * intended for flexible reuse. A more flexible alternative is to use an
- * existing {@code Path} instance as an anchor, such as:
- *
- * Path dir = ...
- * Path path = dir.resolve("file");
- *
+ * @implSpec
+ * This method simply invokes {@link Path#of(String,String...)
+ * Path.of(String, String...)} with the given parameters.
*
* @param first
* the path string or initial part of the path string
@@ -79,38 +63,17 @@ public final class Paths {
* if the path string cannot be converted to a {@code Path}
*
* @see FileSystem#getPath
+ * @see Path#of(String,String...)
*/
public static Path get(String first, String... more) {
- return FileSystems.getDefault().getPath(first, more);
+ return Path.of(first, more);
}
/**
* Converts the given URI to a {@link Path} object.
*
- * This method iterates over the {@link FileSystemProvider#installedProviders()
- * installed} providers to locate the provider that is identified by the
- * URI {@link URI#getScheme scheme} of the given URI. URI schemes are
- * compared without regard to case. If the provider is found then its {@link
- * FileSystemProvider#getPath getPath} method is invoked to convert the
- * URI.
- *
- *
In the case of the default provider, identified by the URI scheme
- * "file", the given URI has a non-empty path component, and undefined query
- * and fragment components. Whether the authority component may be present
- * is platform specific. The returned {@code Path} is associated with the
- * {@link FileSystems#getDefault default} file system.
- *
- *
The default provider provides a similar round-trip guarantee
- * to the {@link java.io.File} class. For a given {@code Path} p it
- * is guaranteed that
- *
{@code
- * Paths.get(}p{@code .}{@link Path#toUri() toUri}{@code ()).equals(}
- * p{@code .}{@link Path#toAbsolutePath() toAbsolutePath}{@code ())}
- *
- * so long as the original {@code Path}, the {@code URI}, and the new {@code
- * Path} are all created in (possibly different invocations of) the same
- * Java virtual machine. Whether other providers make any guarantees is
- * provider specific and therefore unspecified.
+ * @implSpec
+ * This method simply invokes {@link Path#of(URI) * Path.of(URI)} with the given parameter.
*
* @param uri
* the URI to convert
@@ -127,23 +90,10 @@ public final class Paths {
* @throws SecurityException
* if a security manager is installed and it denies an unspecified
* permission to access the file system
+ *
+ * @see Path#of(URI)
*/
public static Path get(URI uri) {
- String scheme = uri.getScheme();
- if (scheme == null)
- throw new IllegalArgumentException("Missing scheme");
-
- // check for default provider to avoid loading of installed providers
- if (scheme.equalsIgnoreCase("file"))
- return FileSystems.getDefault().provider().getPath(uri);
-
- // try to find provider
- for (FileSystemProvider provider: FileSystemProvider.installedProviders()) {
- if (provider.getScheme().equalsIgnoreCase(scheme)) {
- return provider.getPath(uri);
- }
- }
-
- throw new FileSystemNotFoundException("Provider \"" + scheme + "\" not installed");
+ return Path.of(uri);
}
}
diff --git a/src/java.base/share/classes/java/nio/file/TempFileHelper.java b/src/java.base/share/classes/java/nio/file/TempFileHelper.java
index 2b46c5ccbbd..cccc14f880e 100644
--- a/src/java.base/share/classes/java/nio/file/TempFileHelper.java
+++ b/src/java.base/share/classes/java/nio/file/TempFileHelper.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2018, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -46,7 +46,7 @@ class TempFileHelper {
// temporary directory location
private static final Path tmpdir =
- Paths.get(GetPropertyAction.privilegedGetProperty("java.io.tmpdir"));
+ Path.of(GetPropertyAction.privilegedGetProperty("java.io.tmpdir"));
private static final boolean isPosix =
FileSystems.getDefault().supportedFileAttributeViews().contains("posix");
diff --git a/src/java.base/share/classes/java/util/AbstractSet.java b/src/java.base/share/classes/java/util/AbstractSet.java
index 534ef775db1..0a35861aa2a 100644
--- a/src/java.base/share/classes/java/util/AbstractSet.java
+++ b/src/java.base/share/classes/java/util/AbstractSet.java
@@ -93,9 +93,7 @@ public abstract class AbstractSet extends AbstractCollection implements Se
return false;
try {
return containsAll(c);
- } catch (ClassCastException unused) {
- return false;
- } catch (NullPointerException unused) {
+ } catch (ClassCastException | NullPointerException unused) {
return false;
}
}
diff --git a/src/java.base/share/classes/java/util/Formatter.java b/src/java.base/share/classes/java/util/Formatter.java
index 4e8119ea1f3..d61f2774df1 100644
--- a/src/java.base/share/classes/java/util/Formatter.java
+++ b/src/java.base/share/classes/java/util/Formatter.java
@@ -47,6 +47,7 @@ import java.text.DateFormatSymbols;
import java.text.DecimalFormat;
import java.text.DecimalFormatSymbols;
import java.text.NumberFormat;
+import java.text.spi.NumberFormatProvider;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.Objects;
@@ -62,6 +63,8 @@ import java.time.temporal.UnsupportedTemporalTypeException;
import jdk.internal.math.DoubleConsts;
import jdk.internal.math.FormattedFloatingDecimal;
+import sun.util.locale.provider.LocaleProviderAdapter;
+import sun.util.locale.provider.ResourceBundleBasedAdapter;
/**
* An interpreter for printf-style format strings. This class provides support
@@ -4476,8 +4479,33 @@ public final class Formatter implements Closeable, Flushable {
} else {
DecimalFormatSymbols dfs = DecimalFormatSymbols.getInstance(l);
grpSep = dfs.getGroupingSeparator();
- DecimalFormat df = (DecimalFormat) NumberFormat.getIntegerInstance(l);
+ DecimalFormat df = null;
+ NumberFormat nf = NumberFormat.getNumberInstance(l);
+ if (nf instanceof DecimalFormat) {
+ df = (DecimalFormat) nf;
+ } else {
+
+ // Use DecimalFormat constructor to obtain the instance,
+ // in case NumberFormat.getNumberInstance(l)
+ // returns instance other than DecimalFormat
+ LocaleProviderAdapter adapter = LocaleProviderAdapter
+ .getAdapter(NumberFormatProvider.class, l);
+ if (!(adapter instanceof ResourceBundleBasedAdapter)) {
+ adapter = LocaleProviderAdapter.getResourceBundleBased();
+ }
+ String[] all = adapter.getLocaleResources(l)
+ .getNumberPatterns();
+ df = new DecimalFormat(all[0], dfs);
+ }
grpSize = df.getGroupingSize();
+ // Some locales do not use grouping (the number
+ // pattern for these locales does not contain group, e.g.
+ // ("#0.###")), but specify a grouping separator.
+ // To avoid unnecessary identification of the position of
+ // grouping separator, reset its value with null character
+ if (!df.isGroupingUsed() || grpSize == 0) {
+ grpSep = '\0';
+ }
}
}
diff --git a/src/java.base/share/classes/java/util/ImmutableCollections.java b/src/java.base/share/classes/java/util/ImmutableCollections.java
index f31c7164195..4ed5a467b9d 100644
--- a/src/java.base/share/classes/java/util/ImmutableCollections.java
+++ b/src/java.base/share/classes/java/util/ImmutableCollections.java
@@ -70,146 +70,297 @@ class ImmutableCollections {
static UnsupportedOperationException uoe() { return new UnsupportedOperationException(); }
- // ---------- List Implementations ----------
-
- abstract static class AbstractImmutableList extends AbstractList
- implements RandomAccess, Serializable {
+ static abstract class AbstractImmutableCollection extends AbstractCollection {
+ // all mutating methods throw UnsupportedOperationException
@Override public boolean add(E e) { throw uoe(); }
@Override public boolean addAll(Collection c) { throw uoe(); }
- @Override public boolean addAll(int index, Collection c) { throw uoe(); }
@Override public void clear() { throw uoe(); }
@Override public boolean remove(Object o) { throw uoe(); }
@Override public boolean removeAll(Collection c) { throw uoe(); }
@Override public boolean removeIf(Predicate filter) { throw uoe(); }
- @Override public void replaceAll(UnaryOperator operator) { throw uoe(); }
@Override public boolean retainAll(Collection c) { throw uoe(); }
- @Override public void sort(Comparator c) { throw uoe(); }
}
- static final class List0 extends AbstractImmutableList {
- private static final List0 INSTANCE = new List0<>();
+ // ---------- List Implementations ----------
- @SuppressWarnings("unchecked")
- static List0 instance() {
- return (List0) INSTANCE;
- }
+ @SuppressWarnings("unchecked")
+ static List emptyList() {
+ return (List) ListN.EMPTY_LIST;
+ }
- private List0() { }
+ static abstract class AbstractImmutableList extends AbstractImmutableCollection
+ implements List, RandomAccess {
+
+ // all mutating methods throw UnsupportedOperationException
+ @Override public void add(int index, E element) { throw uoe(); }
+ @Override public boolean addAll(int index, Collection c) { throw uoe(); }
+ @Override public E remove(int index) { throw uoe(); }
+ @Override public void replaceAll(UnaryOperator operator) { throw uoe(); }
+ @Override public E set(int index, E element) { throw uoe(); }
+ @Override public void sort(Comparator c) { throw uoe(); }
@Override
- public int size() {
- return 0;
+ public List subList(int fromIndex, int toIndex) {
+ int size = size();
+ subListRangeCheck(fromIndex, toIndex, size);
+ return SubList.fromList(this, fromIndex, toIndex);
}
- @Override
- public E get(int index) {
- Objects.checkIndex(index, 0); // always throws IndexOutOfBoundsException
- return null; // but the compiler doesn't know this
+ static void subListRangeCheck(int fromIndex, int toIndex, int size) {
+ if (fromIndex < 0)
+ throw new IndexOutOfBoundsException("fromIndex = " + fromIndex);
+ if (toIndex > size)
+ throw new IndexOutOfBoundsException("toIndex = " + toIndex);
+ if (fromIndex > toIndex)
+ throw new IllegalArgumentException("fromIndex(" + fromIndex +
+ ") > toIndex(" + toIndex + ")");
}
@Override
public Iterator iterator() {
- return Collections.emptyIterator();
- }
-
- private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
- throw new InvalidObjectException("not serial proxy");
- }
-
- private Object writeReplace() {
- return new CollSer(CollSer.IMM_LIST);
+ return new ListItr(this, size());
}
@Override
- public boolean contains(Object o) {
+ public ListIterator listIterator() {
+ return listIterator(0);
+ }
+
+ @Override
+ public ListIterator listIterator(final int index) {
+ int size = size();
+ if (index < 0 || index > size) {
+ throw outOfBounds(index);
+ }
+ return new ListItr(this, size, index);
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (o == this) {
+ return true;
+ }
+
+ if (!(o instanceof List)) {
+ return false;
+ }
+
+ Iterator oit = ((List) o).iterator();
+ for (int i = 0, s = size(); i < s; i++) {
+ if (!oit.hasNext() || !get(i).equals(oit.next())) {
+ return false;
+ }
+ }
+ return !oit.hasNext();
+ }
+
+ @Override
+ public int indexOf(Object o) {
Objects.requireNonNull(o);
- return false;
+ for (int i = 0, s = size(); i < s; i++) {
+ if (o.equals(get(i))) {
+ return i;
+ }
+ }
+ return -1;
}
@Override
- public boolean containsAll(Collection o) {
- return o.isEmpty(); // implicit nullcheck of o
+ public int lastIndexOf(Object o) {
+ Objects.requireNonNull(o);
+ for (int i = size() - 1; i >= 0; i--) {
+ if (o.equals(get(i))) {
+ return i;
+ }
+ }
+ return -1;
}
@Override
public int hashCode() {
- return 1;
- }
- }
-
- static final class List1 extends AbstractImmutableList {
- @Stable
- private final E e0;
-
- List1(E e0) {
- this.e0 = Objects.requireNonNull(e0);
- }
-
- @Override
- public int size() {
- return 1;
- }
-
- @Override
- public E get(int index) {
- Objects.checkIndex(index, 1);
- return e0;
- }
-
- private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
- throw new InvalidObjectException("not serial proxy");
- }
-
- private Object writeReplace() {
- return new CollSer(CollSer.IMM_LIST, e0);
+ int hash = 1;
+ for (int i = 0, s = size(); i < s; i++) {
+ hash = 31 * hash + get(i).hashCode();
+ }
+ return hash;
}
@Override
public boolean contains(Object o) {
- return o.equals(e0); // implicit nullcheck of o
+ return indexOf(o) >= 0;
}
- @Override
- public int hashCode() {
- return 31 + e0.hashCode();
+ IndexOutOfBoundsException outOfBounds(int index) {
+ return new IndexOutOfBoundsException("Index: " + index + " Size: " + size());
}
}
- static final class List2 extends AbstractImmutableList {
+ static final class ListItr implements ListIterator {
+
+ @Stable
+ private final List list;
+
+ @Stable
+ private final int size;
+
+ private int cursor;
+
+ ListItr(List list, int size) {
+ this(list, size, 0);
+ }
+
+ ListItr(List list, int size, int index) {
+ this.list = list;
+ this.size = size;
+ this.cursor = index;
+ }
+
+ public boolean hasNext() {
+ return cursor != size;
+ }
+
+ public E next() {
+ try {
+ int i = cursor;
+ E next = list.get(i);
+ cursor = i + 1;
+ return next;
+ } catch (IndexOutOfBoundsException e) {
+ throw new NoSuchElementException();
+ }
+ }
+
+ public void remove() {
+ throw uoe();
+ }
+
+ public boolean hasPrevious() {
+ return cursor != 0;
+ }
+
+ public E previous() {
+ try {
+ int i = cursor - 1;
+ E previous = list.get(i);
+ cursor = i;
+ return previous;
+ } catch (IndexOutOfBoundsException e) {
+ throw new NoSuchElementException();
+ }
+ }
+
+ public int nextIndex() {
+ return cursor;
+ }
+
+ public int previousIndex() {
+ return cursor - 1;
+ }
+
+ public void set(E e) {
+ throw uoe();
+ }
+
+ public void add(E e) {
+ throw uoe();
+ }
+ }
+
+ static final class SubList extends AbstractImmutableList
+ implements RandomAccess {
+
+ @Stable
+ private final List root;
+
+ @Stable
+ private final int offset;
+
+ @Stable
+ private final int size;
+
+ private SubList(List root, int offset, int size) {
+ this.root = root;
+ this.offset = offset;
+ this.size = size;
+ }
+
+ /**
+ * Constructs a sublist of another SubList.
+ */
+ static SubList fromSubList(SubList parent, int fromIndex, int toIndex) {
+ return new SubList(parent.root, parent.offset + fromIndex, toIndex - fromIndex);
+ }
+
+ /**
+ * Constructs a sublist of an arbitrary AbstractImmutableList, which is
+ * not a SubList itself.
+ */
+ static SubList fromList(List list, int fromIndex, int toIndex) {
+ return new SubList(list, fromIndex, toIndex - fromIndex);
+ }
+
+ public E get(int index) {
+ Objects.checkIndex(index, size);
+ return root.get(offset + index);
+ }
+
+ public int size() {
+ return size;
+ }
+
+ public Iterator iterator() {
+ return new ListItr(this, size());
+ }
+
+ public ListIterator listIterator(int index) {
+ rangeCheck(index);
+ return new ListItr(this, size(), index);
+ }
+
+ public List subList(int fromIndex, int toIndex) {
+ subListRangeCheck(fromIndex, toIndex, size);
+ return SubList.fromSubList(this, fromIndex, toIndex);
+ }
+
+ private void rangeCheck(int index) {
+ if (index < 0 || index > size) {
+ throw outOfBounds(index);
+ }
+ }
+ }
+
+ static final class List12 extends AbstractImmutableList
+ implements Serializable {
+
@Stable
private final E e0;
+
@Stable
private final E e1;
- List2(E e0, E e1) {
+ List12(E e0) {
+ this.e0 = Objects.requireNonNull(e0);
+ this.e1 = null;
+ }
+
+ List12(E e0, E e1) {
this.e0 = Objects.requireNonNull(e0);
this.e1 = Objects.requireNonNull(e1);
}
@Override
public int size() {
- return 2;
+ return e1 != null ? 2 : 1;
}
@Override
public E get(int index) {
- Objects.checkIndex(index, 2);
if (index == 0) {
return e0;
- } else { // index == 1
+ } else if (index == 1 && e1 != null) {
return e1;
}
- }
-
- @Override
- public boolean contains(Object o) {
- return o.equals(e0) || o.equals(e1); // implicit nullcheck of o
- }
-
- @Override
- public int hashCode() {
- int hash = 31 + e0.hashCode();
- return 31 * hash + e1.hashCode();
+ throw outOfBounds(index);
}
private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
@@ -217,11 +368,20 @@ class ImmutableCollections {
}
private Object writeReplace() {
- return new CollSer(CollSer.IMM_LIST, e0, e1);
+ if (e1 == null) {
+ return new CollSer(CollSer.IMM_LIST, e0);
+ } else {
+ return new CollSer(CollSer.IMM_LIST, e0, e1);
+ }
}
+
}
- static final class ListN extends AbstractImmutableList {
+ static final class ListN extends AbstractImmutableList
+ implements Serializable {
+
+ static final List EMPTY_LIST = new ListN<>();
+
@Stable
private final E[] elements;
@@ -233,7 +393,12 @@ class ImmutableCollections {
for (int i = 0; i < input.length; i++) {
tmp[i] = Objects.requireNonNull(input[i]);
}
- this.elements = tmp;
+ elements = tmp;
+ }
+
+ @Override
+ public boolean isEmpty() {
+ return size() == 0;
}
@Override
@@ -243,29 +408,9 @@ class ImmutableCollections {
@Override
public E get(int index) {
- Objects.checkIndex(index, elements.length);
return elements[index];
}
- @Override
- public boolean contains(Object o) {
- for (E e : elements) {
- if (o.equals(e)) { // implicit nullcheck of o
- return true;
- }
- }
- return false;
- }
-
- @Override
- public int hashCode() {
- int hash = 1;
- for (E e : elements) {
- hash = 31 * hash + e.hashCode();
- }
- return hash;
- }
-
private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
throw new InvalidObjectException("not serial proxy");
}
@@ -277,105 +422,52 @@ class ImmutableCollections {
// ---------- Set Implementations ----------
- abstract static class AbstractImmutableSet extends AbstractSet implements Serializable {
- @Override public boolean add(E e) { throw uoe(); }
- @Override public boolean addAll(Collection c) { throw uoe(); }
- @Override public void clear() { throw uoe(); }
- @Override public boolean remove(Object o) { throw uoe(); }
- @Override public boolean removeAll(Collection c) { throw uoe(); }
- @Override public boolean removeIf(Predicate filter) { throw uoe(); }
- @Override public boolean retainAll(Collection c) { throw uoe(); }
+ static abstract class AbstractImmutableSet extends AbstractImmutableCollection
+ implements Set {
+
+ @Override
+ public boolean equals(Object o) {
+ if (o == this) {
+ return true;
+ } else if (!(o instanceof Set)) {
+ return false;
+ }
+
+ Collection c = (Collection) o;
+ if (c.size() != size()) {
+ return false;
+ }
+ for (Object e : c) {
+ if (e == null || !contains(e)) {
+ return false;
+ }
+ }
+ return true;
+ }
+
+ @Override
+ public abstract int hashCode();
}
- static final class Set0 extends AbstractImmutableSet {
- private static final Set0 INSTANCE = new Set0<>();
-
- @SuppressWarnings("unchecked")
- static Set0 instance() {
- return (Set0) INSTANCE;
- }
-
- private Set0() { }
-
- @Override
- public int size() {
- return 0;
- }
-
- @Override
- public boolean contains(Object o) {
- Objects.requireNonNull(o);
- return false;
- }
-
- @Override
- public boolean containsAll(Collection o) {
- return o.isEmpty(); // implicit nullcheck of o
- }
-
- @Override
- public Iterator iterator() {
- return Collections.emptyIterator();
- }
-
- private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
- throw new InvalidObjectException("not serial proxy");
- }
-
- private Object writeReplace() {
- return new CollSer(CollSer.IMM_SET);
- }
-
- @Override
- public int hashCode() {
- return 0;
- }
+ @SuppressWarnings("unchecked")
+ static Set emptySet() {
+ return (Set) SetN.EMPTY_SET;
}
- static final class Set1 extends AbstractImmutableSet {
- @Stable
- private final E e0;
+ static final class Set12 extends AbstractImmutableSet
+ implements Serializable {
- Set1(E e0) {
- this.e0 = Objects.requireNonNull(e0);
- }
-
- @Override
- public int size() {
- return 1;
- }
-
- @Override
- public boolean contains(Object o) {
- return o.equals(e0); // implicit nullcheck of o
- }
-
- @Override
- public Iterator iterator() {
- return Collections.singletonIterator(e0);
- }
-
- private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
- throw new InvalidObjectException("not serial proxy");
- }
-
- private Object writeReplace() {
- return new CollSer(CollSer.IMM_SET, e0);
- }
-
- @Override
- public int hashCode() {
- return e0.hashCode();
- }
- }
-
- static final class Set2 extends AbstractImmutableSet {
@Stable
final E e0;
@Stable
final E e1;
- Set2(E e0, E e1) {
+ Set12(E e0) {
+ this.e0 = Objects.requireNonNull(e0);
+ this.e1 = null;
+ }
+
+ Set12(E e0, E e1) {
if (e0.equals(Objects.requireNonNull(e1))) { // implicit nullcheck of e0
throw new IllegalArgumentException("duplicate element: " + e0);
}
@@ -391,7 +483,7 @@ class ImmutableCollections {
@Override
public int size() {
- return 2;
+ return (e1 == null) ? 1 : 2;
}
@Override
@@ -401,26 +493,26 @@ class ImmutableCollections {
@Override
public int hashCode() {
- return e0.hashCode() + e1.hashCode();
+ return e0.hashCode() + (e1 == null ? 0 : e1.hashCode());
}
@Override
public Iterator iterator() {
- return new Iterator() {
- private int idx = 0;
+ return new Iterator<>() {
+ private int idx = size();
@Override
public boolean hasNext() {
- return idx < 2;
+ return idx > 0;
}
@Override
public E next() {
- if (idx == 0) {
- idx = 1;
+ if (idx == 1) {
+ idx = 0;
return e0;
- } else if (idx == 1) {
- idx = 2;
+ } else if (idx == 2) {
+ idx = 1;
return e1;
} else {
throw new NoSuchElementException();
@@ -434,7 +526,11 @@ class ImmutableCollections {
}
private Object writeReplace() {
- return new CollSer(CollSer.IMM_SET, e0, e1);
+ if (e1 == null) {
+ return new CollSer(CollSer.IMM_SET, e0);
+ } else {
+ return new CollSer(CollSer.IMM_SET, e0, e1);
+ }
}
}
@@ -444,7 +540,11 @@ class ImmutableCollections {
* least one null is always present.
* @param the element type
*/
- static final class SetN extends AbstractImmutableSet {
+ static final class SetN extends AbstractImmutableSet
+ implements Serializable {
+
+ static final Set EMPTY_SET = new SetN<>();
+
@Stable
final E[] elements;
@Stable
@@ -474,12 +574,13 @@ class ImmutableCollections {
@Override
public boolean contains(Object o) {
- return probe(o) >= 0; // implicit nullcheck of o
+ Objects.requireNonNull(o);
+ return size > 0 && probe(o) >= 0;
}
@Override
public Iterator iterator() {
- return new Iterator() {
+ return new Iterator<>() {
private int idx = 0;
@Override
@@ -549,6 +650,11 @@ class ImmutableCollections {
// ---------- Map Implementations ----------
+ @SuppressWarnings("unchecked")
+ static Map emptyMap() {
+ return (Map) MapN.EMPTY_MAP;
+ }
+
abstract static class AbstractImmutableMap extends AbstractMap implements Serializable {
@Override public void clear() { throw uoe(); }
@Override public V compute(K key, BiFunction rf) { throw uoe(); }
@@ -565,47 +671,6 @@ class ImmutableCollections {
@Override public void replaceAll(BiFunction f) { throw uoe(); }
}
- static final class Map0 extends AbstractImmutableMap {
- private static final Map0 INSTANCE = new Map0<>();
-
- @SuppressWarnings("unchecked")
- static Map0 instance() {
- return (Map0) INSTANCE;
- }
-
- private Map0() { }
-
- @Override
- public Set> entrySet() {
- return Set.of();
- }
-
- @Override
- public boolean containsKey(Object o) {
- Objects.requireNonNull(o);
- return false;
- }
-
- @Override
- public boolean containsValue(Object o) {
- Objects.requireNonNull(o);
- return false;
- }
-
- private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
- throw new InvalidObjectException("not serial proxy");
- }
-
- private Object writeReplace() {
- return new CollSer(CollSer.IMM_MAP);
- }
-
- @Override
- public int hashCode() {
- return 0;
- }
- }
-
static final class Map1 extends AbstractImmutableMap {
@Stable
private final K k0;
@@ -656,8 +721,12 @@ class ImmutableCollections {
* @param the value type
*/
static final class MapN extends AbstractImmutableMap {
+
+ static final Map EMPTY_MAP = new MapN<>();
+
@Stable
final Object[] table; // pairs of key, value
+
@Stable
final int size; // number of pairs
@@ -689,14 +758,16 @@ class ImmutableCollections {
@Override
public boolean containsKey(Object o) {
- return probe(o) >= 0; // implicit nullcheck of o
+ Objects.requireNonNull(o);
+ return size > 0 && probe(o) >= 0;
}
@Override
public boolean containsValue(Object o) {
+ Objects.requireNonNull(o);
for (int i = 1; i < table.length; i += 2) {
Object v = table[i];
- if (v != null && o.equals(v)) { // implicit nullcheck of o
+ if (v != null && o.equals(v)) {
return true;
}
}
@@ -718,6 +789,10 @@ class ImmutableCollections {
@Override
@SuppressWarnings("unchecked")
public V get(Object o) {
+ if (size == 0) {
+ Objects.requireNonNull(o);
+ return null;
+ }
int i = probe(o);
if (i >= 0) {
return (V)table[i+1];
@@ -733,7 +808,7 @@ class ImmutableCollections {
@Override
public Set> entrySet() {
- return new AbstractSet>() {
+ return new AbstractSet<>() {
@Override
public int size() {
return MapN.this.size;
@@ -741,7 +816,7 @@ class ImmutableCollections {
@Override
public Iterator> iterator() {
- return new Iterator>() {
+ return new Iterator<>() {
int idx = 0;
@Override
@@ -948,7 +1023,7 @@ final class CollSer implements Serializable {
return Set.of(array);
case IMM_MAP:
if (array.length == 0) {
- return ImmutableCollections.Map0.instance();
+ return ImmutableCollections.emptyMap();
} else if (array.length == 2) {
return new ImmutableCollections.Map1<>(array[0], array[1]);
} else {
diff --git a/src/java.base/share/classes/java/util/List.java b/src/java.base/share/classes/java/util/List.java
index 5672508afb1..05428b75942 100644
--- a/src/java.base/share/classes/java/util/List.java
+++ b/src/java.base/share/classes/java/util/List.java
@@ -788,7 +788,7 @@ public interface List extends Collection {
* @since 9
*/
static List of() {
- return ImmutableCollections.List0.instance();
+ return ImmutableCollections.emptyList();
}
/**
@@ -804,7 +804,7 @@ public interface List extends Collection {
* @since 9
*/
static List of(E e1) {
- return new ImmutableCollections.List1<>(e1);
+ return new ImmutableCollections.List12<>(e1);
}
/**
@@ -821,7 +821,7 @@ public interface List extends Collection {
* @since 9
*/
static List of(E e1, E e2) {
- return new ImmutableCollections.List2<>(e1, e2);
+ return new ImmutableCollections.List12<>(e1, e2);
}
/**
@@ -1031,11 +1031,11 @@ public interface List extends Collection {
static List of(E... elements) {
switch (elements.length) { // implicit null check of elements
case 0:
- return ImmutableCollections.List0.instance();
+ return ImmutableCollections.emptyList();
case 1:
- return new ImmutableCollections.List1<>(elements[0]);
+ return new ImmutableCollections.List12<>(elements[0]);
case 2:
- return new ImmutableCollections.List2<>(elements[0], elements[1]);
+ return new ImmutableCollections.List12<>(elements[0], elements[1]);
default:
return new ImmutableCollections.ListN<>(elements);
}
diff --git a/src/java.base/share/classes/java/util/Map.java b/src/java.base/share/classes/java/util/Map.java
index efe330e80ad..94e67a453bd 100644
--- a/src/java.base/share/classes/java/util/Map.java
+++ b/src/java.base/share/classes/java/util/Map.java
@@ -1287,7 +1287,7 @@ public interface Map {
* @since 9
*/
static Map of() {
- return ImmutableCollections.Map0.instance();
+ return ImmutableCollections.emptyMap();
}
/**
@@ -1604,11 +1604,11 @@ public interface Map {
@SuppressWarnings("varargs")
static Map ofEntries(Entry... entries) {
if (entries.length == 0) { // implicit null check of entries array
- return ImmutableCollections.Map0.instance();
+ return ImmutableCollections.emptyMap();
} else if (entries.length == 1) {
// implicit null check of the array slot
return new ImmutableCollections.Map1<>(entries[0].getKey(),
- entries[0].getValue());
+ entries[0].getValue());
} else {
Object[] kva = new Object[entries.length << 1];
int a = 0;
diff --git a/src/java.base/share/classes/java/util/Scanner.java b/src/java.base/share/classes/java/util/Scanner.java
index 7ac4fb3422b..bde2ae328eb 100644
--- a/src/java.base/share/classes/java/util/Scanner.java
+++ b/src/java.base/share/classes/java/util/Scanner.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2018, 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
@@ -2897,7 +2897,7 @@ public final class Scanner implements Iterator, Closeable {
* letters:
*
* {@code
- * try (Scanner sc = new Scanner(Paths.get("input.txt"))) {
+ * try (Scanner sc = new Scanner(Path.of("input.txt"))) {
* Pattern pat = Pattern.compile("[A-Z]{7,}");
* List capWords = sc.findAll(pat)
* .map(MatchResult::group)
diff --git a/src/java.base/share/classes/java/util/Set.java b/src/java.base/share/classes/java/util/Set.java
index b662896dd7f..aadae49a880 100644
--- a/src/java.base/share/classes/java/util/Set.java
+++ b/src/java.base/share/classes/java/util/Set.java
@@ -449,7 +449,7 @@ public interface Set extends Collection {
* @since 9
*/
static Set of() {
- return ImmutableCollections.Set0.instance();
+ return ImmutableCollections.emptySet();
}
/**
@@ -464,7 +464,7 @@ public interface Set extends Collection {
* @since 9
*/
static Set of(E e1) {
- return new ImmutableCollections.Set1<>(e1);
+ return new ImmutableCollections.Set12<>(e1);
}
/**
@@ -481,7 +481,7 @@ public interface Set extends Collection {
* @since 9
*/
static Set of(E e1, E e2) {
- return new ImmutableCollections.Set2<>(e1, e2);
+ return new ImmutableCollections.Set12<>(e1, e2);
}
/**
@@ -692,11 +692,11 @@ public interface Set extends Collection {
static Set of(E... elements) {
switch (elements.length) { // implicit null check of elements
case 0:
- return ImmutableCollections.Set0.instance();
+ return ImmutableCollections.emptySet();
case 1:
- return new ImmutableCollections.Set1<>(elements[0]);
+ return new ImmutableCollections.Set12<>(elements[0]);
case 2:
- return new ImmutableCollections.Set2<>(elements[0], elements[1]);
+ return new ImmutableCollections.Set12<>(elements[0], elements[1]);
default:
return new ImmutableCollections.SetN<>(elements);
}
diff --git a/src/java.base/share/classes/javax/security/auth/AuthPermission.java b/src/java.base/share/classes/javax/security/auth/AuthPermission.java
index bfdd022c138..34c8d1ba87a 100644
--- a/src/java.base/share/classes/javax/security/auth/AuthPermission.java
+++ b/src/java.base/share/classes/javax/security/auth/AuthPermission.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2018, 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
@@ -32,7 +32,7 @@ package javax.security.auth;
*
* The target name is the name of a security configuration parameter
* (see below). Currently the {@code AuthPermission} object is used to
- * guard access to the {@link Policy}, {@link Subject},
+ * guard access to the {@link Subject},
* {@link javax.security.auth.login.LoginContext}, and
* {@link javax.security.auth.login.Configuration} objects.
*
@@ -121,21 +121,6 @@ package javax.security.auth;
* {@code LoginContext}.
*
*
- * {@code javax.security.auth.Policy} has been
- * deprecated in favor of {@code java.security.Policy}.
- * Therefore, the following target names have also been deprecated:
- *
- *
- * getPolicy - allow the caller to retrieve the system-wide
- * Subject-based access control policy.
- *
- * setPolicy - allow the caller to set the system-wide
- * Subject-based access control policy.
- *
- * refreshPolicy - allow the caller to refresh the system-wide
- * Subject-based access control policy.
- *
- *
* @implNote
* Implementations may define additional target names, but should use naming
* conventions such as reverse domain name notation to avoid name clashes.
diff --git a/src/java.base/share/classes/javax/security/auth/Policy.java b/src/java.base/share/classes/javax/security/auth/Policy.java
deleted file mode 100644
index f95732c4840..00000000000
--- a/src/java.base/share/classes/javax/security/auth/Policy.java
+++ /dev/null
@@ -1,356 +0,0 @@
-/*
- * Copyright (c) 1998, 2017, 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 javax.security.auth;
-
-import java.security.Security;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-import java.security.PrivilegedExceptionAction;
-import java.util.Objects;
-import sun.security.util.Debug;
-
-/**
- * This is an abstract class for representing the system policy for
- * Subject-based authorization. A subclass implementation
- * of this class provides a means to specify a Subject-based
- * access control {@code Policy}.
- *
- *
A {@code Policy} object can be queried for the set of
- * Permissions granted to code running as a
- * {@code Principal} in the following manner:
- *
- *
- * policy = Policy.getPolicy();
- * PermissionCollection perms = policy.getPermissions(subject,
- * codeSource);
- *
- *
- * The {@code Policy} object consults the local policy and returns
- * and appropriate {@code Permissions} object with the
- * Permissions granted to the Principals associated with the
- * provided {@code subject}, and granted to the code specified
- * by the provided {@code codeSource}.
- *
- * A {@code Policy} contains the following information.
- * Note that this example only represents the syntax for the default
- * {@code Policy} implementation. Subclass implementations of this class
- * may implement alternative syntaxes and may retrieve the
- * {@code Policy} from any source such as files, databases,
- * or servers.
- *
- *
Each entry in the {@code Policy} is represented as
- * a grant entry. Each grant entry
- * specifies a codebase, code signers, and Principals triplet,
- * as well as the Permissions granted to that triplet.
- *
- *
- * grant CodeBase ["URL"], Signedby ["signers"],
- * Principal [Principal_Class] "Principal_Name" {
- * Permission Permission_Class ["Target_Name"]
- * [, "Permission_Actions"]
- * [, signedBy "SignerName"];
- * };
- *
- *
- * The CodeBase and Signedby components of the triplet name/value pairs
- * are optional. If they are not present, then any codebase will match,
- * and any signer (including unsigned code) will match.
- * For Example,
- *
- *
- * grant CodeBase "foo.com", Signedby "foo",
- * Principal com.sun.security.auth.UnixPrincipal "duke" {
- * permission java.io.FilePermission "/home/duke", "read, write";
- * };
- *
- *
- * This grant entry specifies that code from "foo.com",
- * signed by "foo', and running as a {@code UnixPrincipal} with the
- * name, duke, has one {@code Permission}. This {@code Permission}
- * permits the executing code to read and write files in the directory,
- * "/home/duke".
- *
- * To "run" as a particular {@code Principal},
- * code invokes the {@code Subject.doAs(subject, ...)} method.
- * After invoking that method, the code runs as all the Principals
- * associated with the specified {@code Subject}.
- * Note that this {@code Policy} (and the Permissions
- * granted in this {@code Policy}) only become effective
- * after the call to {@code Subject.doAs} has occurred.
- *
- *
Multiple Principals may be listed within one grant entry.
- * All the Principals in the grant entry must be associated with
- * the {@code Subject} provided to {@code Subject.doAs}
- * for that {@code Subject} to be granted the specified Permissions.
- *
- *
- * grant Principal com.sun.security.auth.UnixPrincipal "duke",
- * Principal com.sun.security.auth.UnixNumericUserPrincipal "0" {
- * permission java.io.FilePermission "/home/duke", "read, write";
- * permission java.net.SocketPermission "duke.com", "connect";
- * };
- *
- *
- * This entry grants any code running as both "duke" and "0"
- * permission to read and write files in duke's home directory,
- * as well as permission to make socket connections to "duke.com".
- *
- * Note that non Principal-based grant entries are not permitted
- * in this {@code Policy}. Therefore, grant entries such as:
- *
- *
- * grant CodeBase "foo.com", Signedby "foo" {
- * permission java.io.FilePermission "/tmp/scratch", "read, write";
- * };
- *
- *
- * are rejected. Such permission must be listed in the
- * {@code java.security.Policy}.
- *
- * The default {@code Policy} implementation can be changed by
- * setting the value of the {@code auth.policy.provider} security property to
- * the fully qualified name of the desired {@code Policy} implementation class.
- *
- * @deprecated Replaced by java.security.Policy.
- * java.security.Policy has a method:
- *
- * public PermissionCollection getPermissions
- * (java.security.ProtectionDomain pd)
- *
- *
- * and ProtectionDomain has a constructor:
- *
- * public ProtectionDomain
- * (CodeSource cs,
- * PermissionCollection permissions,
- * ClassLoader loader,
- * Principal[] principals)
- *
- *
- * These two APIs provide callers the means to query the
- * Policy for Principal-based Permission entries.
- * This class is subject to removal in a future version of Java SE.
- *
- * @since 1.4
- * @see java.security.Security security properties
- */
-@Deprecated(since="1.4", forRemoval=true)
-public abstract class Policy {
-
- private static Policy policy;
- private static final String AUTH_POLICY =
- "sun.security.provider.AuthPolicyFile";
-
- private final java.security.AccessControlContext acc =
- java.security.AccessController.getContext();
-
- // true if a custom (not AUTH_POLICY) system-wide policy object is set
- private static boolean isCustomPolicy;
-
- /**
- * Sole constructor. (For invocation by subclass constructors, typically
- * implicit.)
- */
- protected Policy() { }
-
- /**
- * Returns the installed Policy object.
- * This method first calls
- * {@code SecurityManager.checkPermission} with the
- * {@code AuthPermission("getPolicy")} permission
- * to ensure the caller has permission to get the Policy object.
- *
- * @return the installed Policy. The return value cannot be
- * {@code null}.
- *
- * @exception java.lang.SecurityException if the current thread does not
- * have permission to get the Policy object.
- *
- * @see #setPolicy
- */
- public static Policy getPolicy() {
- java.lang.SecurityManager sm = System.getSecurityManager();
- if (sm != null) sm.checkPermission(new AuthPermission("getPolicy"));
- return getPolicyNoCheck();
- }
-
- /**
- * Returns the installed Policy object, skipping the security check.
- *
- * @return the installed Policy.
- *
- */
- static Policy getPolicyNoCheck() {
- if (policy == null) {
-
- synchronized(Policy.class) {
-
- if (policy == null) {
- String policy_class = null;
- policy_class = AccessController.doPrivileged
- (new PrivilegedAction() {
- public String run() {
- return java.security.Security.getProperty
- ("auth.policy.provider");
- }
- });
- if (policy_class == null) {
- policy_class = AUTH_POLICY;
- }
-
- try {
- final String finalClass = policy_class;
-
- Policy untrustedImpl = AccessController.doPrivileged(
- new PrivilegedExceptionAction() {
- public Policy run() throws ClassNotFoundException,
- InstantiationException,
- IllegalAccessException {
- Class implClass = Class.forName(
- finalClass, false,
- Thread.currentThread().getContextClassLoader()
- ).asSubclass(Policy.class);
- return implClass.newInstance();
- }
- });
- AccessController.doPrivileged(
- new PrivilegedExceptionAction() {
- public Void run() {
- setPolicy(untrustedImpl);
- isCustomPolicy = !finalClass.equals(AUTH_POLICY);
- return null;
- }
- }, Objects.requireNonNull(untrustedImpl.acc)
- );
- } catch (Exception e) {
- throw new SecurityException
- (sun.security.util.ResourcesMgr.getString
- ("unable.to.instantiate.Subject.based.policy"));
- }
- }
- }
- }
- return policy;
- }
-
-
- /**
- * Sets the system-wide Policy object. This method first calls
- * {@code SecurityManager.checkPermission} with the
- * {@code AuthPermission("setPolicy")}
- * permission to ensure the caller has permission to set the Policy.
- *
- * @param policy the new system Policy object.
- *
- * @exception java.lang.SecurityException if the current thread does not
- * have permission to set the Policy.
- *
- * @see #getPolicy
- */
- public static void setPolicy(Policy policy) {
- java.lang.SecurityManager sm = System.getSecurityManager();
- if (sm != null) sm.checkPermission(new AuthPermission("setPolicy"));
- Policy.policy = policy;
- // all non-null policy objects are assumed to be custom
- isCustomPolicy = policy != null ? true : false;
- }
-
- /**
- * Returns true if a custom (not AUTH_POLICY) system-wide policy object
- * has been set or installed. This method is called by
- * SubjectDomainCombiner to provide backwards compatibility for
- * developers that provide their own javax.security.auth.Policy
- * implementations.
- *
- * @return true if a custom (not AUTH_POLICY) system-wide policy object
- * has been set; false otherwise
- */
- static boolean isCustomPolicySet(Debug debug) {
- if (policy != null) {
- if (debug != null && isCustomPolicy) {
- debug.println("Providing backwards compatibility for " +
- "javax.security.auth.policy implementation: " +
- policy.toString());
- }
- return isCustomPolicy;
- }
- // check if custom policy has been set using auth.policy.provider prop
- String policyClass = java.security.AccessController.doPrivileged
- (new java.security.PrivilegedAction() {
- public String run() {
- return Security.getProperty("auth.policy.provider");
- }
- });
- if (policyClass != null && !policyClass.equals(AUTH_POLICY)) {
- if (debug != null) {
- debug.println("Providing backwards compatibility for " +
- "javax.security.auth.policy implementation: " +
- policyClass);
- }
- return true;
- }
- return false;
- }
-
- /**
- * Retrieve the Permissions granted to the Principals associated with
- * the specified {@code CodeSource}.
- *
- * @param subject the {@code Subject}
- * whose associated Principals,
- * in conjunction with the provided
- * {@code CodeSource}, determines the Permissions
- * returned by this method. This parameter
- * may be {@code null}.
- *
- * @param cs the code specified by its {@code CodeSource}
- * that determines, in conjunction with the provided
- * {@code Subject}, the Permissions
- * returned by this method. This parameter may be
- * {@code null}.
- *
- * @return the Collection of Permissions granted to all the
- * {@code Subject} and code specified in
- * the provided subject and cs
- * parameters.
- */
- public abstract java.security.PermissionCollection getPermissions
- (Subject subject,
- java.security.CodeSource cs);
-
- /**
- * Refresh and reload the Policy.
- *
- * This method causes this object to refresh/reload its current
- * Policy. This is implementation-dependent.
- * For example, if the Policy object is stored in
- * a file, calling {@code refresh} will cause the file to be re-read.
- *
- * @exception SecurityException if the caller does not have permission
- * to refresh the Policy.
- */
- public abstract void refresh();
-}
diff --git a/src/java.base/share/classes/javax/security/auth/SubjectDomainCombiner.java b/src/java.base/share/classes/javax/security/auth/SubjectDomainCombiner.java
index 97ace14095d..d2a892f5cc1 100644
--- a/src/java.base/share/classes/javax/security/auth/SubjectDomainCombiner.java
+++ b/src/java.base/share/classes/javax/security/auth/SubjectDomainCombiner.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2018, 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
@@ -26,13 +26,9 @@
package javax.security.auth;
import java.security.AccessController;
-import java.security.Permission;
-import java.security.Permissions;
-import java.security.PermissionCollection;
import java.security.Principal;
import java.security.PrivilegedAction;
import java.security.ProtectionDomain;
-import java.security.Security;
import java.util.Set;
import java.util.WeakHashMap;
import java.lang.ref.WeakReference;
@@ -56,15 +52,6 @@ public class SubjectDomainCombiner implements java.security.DomainCombiner {
sun.security.util.Debug.getInstance("combiner",
"\t[SubjectDomainCombiner]");
- @SuppressWarnings({"deprecation", "removal"})
- // Note: check only at classloading time, not dynamically during combine()
- private static final boolean useJavaxPolicy =
- javax.security.auth.Policy.isCustomPolicySet(debug);
-
- // Relevant only when useJavaxPolicy is true
- private static final boolean allowCaching =
- (useJavaxPolicy && cachePolicy());
-
/**
* Associate the provided {@code Subject} with this
* {@code SubjectDomainCombiner}.
@@ -196,12 +183,6 @@ public class SubjectDomainCombiner implements java.security.DomainCombiner {
return null;
}
- // maintain backwards compatibility for developers who provide
- // their own custom javax.security.auth.Policy implementations
- if (useJavaxPolicy) {
- return combineJavaxPolicy(currentDomains, assignedDomains);
- }
-
int cLen = (currentDomains == null ? 0 : currentDomains.length);
int aLen = (assignedDomains == null ? 0 : assignedDomains.length);
@@ -292,151 +273,6 @@ public class SubjectDomainCombiner implements java.security.DomainCombiner {
}
}
- /**
- * Use the javax.security.auth.Policy implementation
- */
- private ProtectionDomain[] combineJavaxPolicy(
- ProtectionDomain[] currentDomains,
- ProtectionDomain[] assignedDomains) {
-
- if (!allowCaching) {
- java.security.AccessController.doPrivileged
- (new PrivilegedAction() {
- @SuppressWarnings({"deprecation", "removal"})
- public Void run() {
- // Call refresh only caching is disallowed
- javax.security.auth.Policy.getPolicy().refresh();
- return null;
- }
- });
- }
-
-
- int cLen = (currentDomains == null ? 0 : currentDomains.length);
- int aLen = (assignedDomains == null ? 0 : assignedDomains.length);
-
- // the ProtectionDomains for the new AccessControlContext
- // that we will return
- ProtectionDomain[] newDomains = new ProtectionDomain[cLen + aLen];
-
- synchronized(cachedPDs) {
- if (!subject.isReadOnly() &&
- !subject.getPrincipals().equals(principalSet)) {
-
- // if the Subject was mutated, clear the PD cache
- Set newSet = subject.getPrincipals();
- synchronized(newSet) {
- principalSet = new java.util.HashSet(newSet);
- }
- principals = principalSet.toArray
- (new Principal[principalSet.size()]);
- cachedPDs.clear();
-
- if (debug != null) {
- debug.println("Subject mutated - clearing cache");
- }
- }
-
- for (int i = 0; i < cLen; i++) {
- ProtectionDomain pd = currentDomains[i];
- ProtectionDomain subjectPd = cachedPDs.getValue(pd);
-
- if (subjectPd == null) {
- if (pd.staticPermissionsOnly()) {
- // keep static ProtectionDomain objects static
- subjectPd = pd;
- } else {
- // XXX
- // we must first add the original permissions.
- // that way when we later add the new JAAS permissions,
- // any unresolved JAAS-related permissions will
- // automatically get resolved.
-
- // get the original perms
- Permissions perms = new Permissions();
- PermissionCollection coll = pd.getPermissions();
- java.util.Enumeration e;
- if (coll != null) {
- synchronized (coll) {
- e = coll.elements();
- while (e.hasMoreElements()) {
- Permission newPerm =
- e.nextElement();
- perms.add(newPerm);
- }
- }
- }
-
- // get perms from the policy
- final java.security.CodeSource finalCs = pd.getCodeSource();
- final Subject finalS = subject;
- PermissionCollection newPerms =
- java.security.AccessController.doPrivileged
- (new PrivilegedAction() {
- @SuppressWarnings({"deprecation", "removal"})
- public PermissionCollection run() {
- return
- javax.security.auth.Policy.getPolicy().getPermissions
- (finalS, finalCs);
- }
- });
-
- // add the newly granted perms,
- // avoiding duplicates
- synchronized (newPerms) {
- e = newPerms.elements();
- while (e.hasMoreElements()) {
- Permission newPerm = e.nextElement();
- if (!perms.implies(newPerm)) {
- perms.add(newPerm);
- if (debug != null)
- debug.println (
- "Adding perm " + newPerm + "\n");
- }
- }
- }
- subjectPd = new ProtectionDomain
- (finalCs, perms, pd.getClassLoader(), principals);
- }
- if (allowCaching)
- cachedPDs.putValue(pd, subjectPd);
- }
- newDomains[i] = subjectPd;
- }
- }
-
- if (debug != null) {
- debug.println("updated current: ");
- for (int i = 0; i < cLen; i++) {
- debug.println("\tupdated[" + i + "] = " + newDomains[i]);
- }
- }
-
- // now add on the assigned domains
- if (aLen > 0) {
- System.arraycopy(assignedDomains, 0, newDomains, cLen, aLen);
- }
-
- if (debug != null) {
- if (newDomains == null || newDomains.length == 0) {
- debug.println("returning null");
- } else {
- debug.println("combinedDomains: ");
- for (int i = 0; i < newDomains.length; i++) {
- debug.println("newDomain " + i + ": " +
- newDomains[i].toString());
- }
- }
- }
-
- // return the new ProtectionDomains
- if (newDomains == null || newDomains.length == 0) {
- return null;
- } else {
- return newDomains;
- }
- }
-
private static ProtectionDomain[] optimize(ProtectionDomain[] domains) {
if (domains == null || domains.length == 0)
return null;
@@ -476,21 +312,6 @@ public class SubjectDomainCombiner implements java.security.DomainCombiner {
return ((num == 0 || optimized.length == 0) ? null : optimized);
}
- private static boolean cachePolicy() {
- String s = AccessController.doPrivileged
- (new PrivilegedAction() {
- public String run() {
- return Security.getProperty("cache.auth.policy");
- }
- });
- if (s != null) {
- return Boolean.parseBoolean(s);
- }
-
- // cache by default
- return true;
- }
-
private static void printInputDomains(ProtectionDomain[] currentDomains,
ProtectionDomain[] assignedDomains) {
if (currentDomains == null || currentDomains.length == 0) {
diff --git a/src/java.base/share/classes/jdk/internal/loader/BootLoader.java b/src/java.base/share/classes/jdk/internal/loader/BootLoader.java
index d01197795fc..9d5d943b090 100644
--- a/src/java.base/share/classes/jdk/internal/loader/BootLoader.java
+++ b/src/java.base/share/classes/jdk/internal/loader/BootLoader.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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
@@ -32,7 +32,6 @@ import java.net.URI;
import java.net.URL;
import java.nio.file.Files;
import java.nio.file.Path;
-import java.nio.file.Paths;
import java.security.AccessController;
import java.security.PrivilegedAction;
import java.util.Arrays;
@@ -243,8 +242,8 @@ public class BootLoader {
mn = location.substring(5, location.length());
} else if (location.startsWith("file:/")) {
// named module in exploded image
- Path path = Paths.get(URI.create(location));
- Path modulesDir = Paths.get(JAVA_HOME, "modules");
+ Path path = Path.of(URI.create(location));
+ Path modulesDir = Path.of(JAVA_HOME, "modules");
if (path.startsWith(modulesDir)) {
mn = path.getFileName().toString();
}
@@ -267,7 +266,7 @@ public class BootLoader {
private static URL toFileURL(String location) {
return AccessController.doPrivileged(new PrivilegedAction<>() {
public URL run() {
- Path path = Paths.get(location);
+ Path path = Path.of(location);
if (Files.isRegularFile(path)) {
try {
return path.toUri().toURL();
@@ -285,7 +284,7 @@ public class BootLoader {
private static Manifest getManifest(String location) {
return AccessController.doPrivileged(new PrivilegedAction<>() {
public Manifest run() {
- Path jar = Paths.get(location);
+ Path jar = Path.of(location);
try (InputStream in = Files.newInputStream(jar);
JarInputStream jis = new JarInputStream(in, false)) {
return jis.getManifest();
diff --git a/src/java.base/share/classes/jdk/internal/loader/ClassLoaders.java b/src/java.base/share/classes/jdk/internal/loader/ClassLoaders.java
index c76e236cb5d..8d1a9e5ba37 100644
--- a/src/java.base/share/classes/jdk/internal/loader/ClassLoaders.java
+++ b/src/java.base/share/classes/jdk/internal/loader/ClassLoaders.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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
@@ -28,7 +28,7 @@ package jdk.internal.loader;
import java.io.IOException;
import java.net.URL;
import java.nio.file.InvalidPathException;
-import java.nio.file.Paths;
+import java.nio.file.Path;
import java.security.CodeSource;
import java.security.PermissionCollection;
import java.util.jar.Manifest;
@@ -223,7 +223,7 @@ public class ClassLoaders {
// Use an intermediate File object to construct a URI/URL without
// authority component as URLClassPath can't handle URLs with a UNC
// server name in the authority component.
- return Paths.get(s).toRealPath().toFile().toURI().toURL();
+ return Path.of(s).toRealPath().toFile().toURI().toURL();
} catch (InvalidPathException | IOException ignore) {
// malformed path string or class path element does not exist
return null;
diff --git a/src/java.base/share/classes/jdk/internal/misc/JavaLangInvokeAccess.java b/src/java.base/share/classes/jdk/internal/misc/JavaLangInvokeAccess.java
index 75751839bd7..f1c5fe9b0be 100644
--- a/src/java.base/share/classes/jdk/internal/misc/JavaLangInvokeAccess.java
+++ b/src/java.base/share/classes/jdk/internal/misc/JavaLangInvokeAccess.java
@@ -84,7 +84,7 @@ public interface JavaLangInvokeAccess {
/**
* Returns a {@code byte[]} representation of {@code BoundMethodHandle}
* species class implementing the signature defined by {@code types}. Used
- * by GenerateBMHClassesPlugin to enable generation of such classes during
+ * by GenerateJLIClassesPlugin to enable generation of such classes during
* the jlink phase. Should do some added validation since this string may be
* user provided.
*/
@@ -99,8 +99,11 @@ public interface JavaLangInvokeAccess {
/**
* Returns a {@code byte[]} representation of a class implementing
- * the invoker forms for the set of supplied {@code methodTypes}.
+ * the invoker forms for the set of supplied {@code invokerMethodTypes}
+ * and {@code callSiteMethodTypes}.
*/
byte[] generateInvokersHolderClassBytes(String className,
- MethodType[] methodTypes);
+ MethodType[] invokerMethodTypes,
+ MethodType[] callSiteMethodTypes);
+
}
diff --git a/src/java.base/share/classes/jdk/internal/module/ModuleBootstrap.java b/src/java.base/share/classes/jdk/internal/module/ModuleBootstrap.java
index 856ee4c23b8..317db6e1236 100644
--- a/src/java.base/share/classes/jdk/internal/module/ModuleBootstrap.java
+++ b/src/java.base/share/classes/jdk/internal/module/ModuleBootstrap.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2018, 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
@@ -34,7 +34,6 @@ import java.lang.module.ModuleReference;
import java.lang.module.ResolvedModule;
import java.net.URI;
import java.nio.file.Path;
-import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
@@ -539,7 +538,7 @@ public final class ModuleBootstrap {
Path[] paths = new Path[dirs.length];
int i = 0;
for (String dir: dirs) {
- paths[i++] = Paths.get(dir);
+ paths[i++] = Path.of(dir);
}
return ModulePath.of(patcher, paths);
}
diff --git a/src/java.base/share/classes/jdk/internal/module/ModuleHashesBuilder.java b/src/java.base/share/classes/jdk/internal/module/ModuleHashesBuilder.java
index 1f9d94ca1d9..053a42a64c8 100644
--- a/src/java.base/share/classes/jdk/internal/module/ModuleHashesBuilder.java
+++ b/src/java.base/share/classes/jdk/internal/module/ModuleHashesBuilder.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2018, 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
@@ -30,7 +30,6 @@ import java.lang.module.Configuration;
import java.lang.module.ResolvedModule;
import java.net.URI;
import java.nio.file.Path;
-import java.nio.file.Paths;
import java.util.ArrayDeque;
import java.util.Collections;
import java.util.Deque;
@@ -129,7 +128,7 @@ public class ModuleHashesBuilder {
() -> new InternalError("Selected module " + name + " not on module path"));
URI uri = rm.reference().location().get();
- Path path = Paths.get(uri);
+ Path path = Path.of(uri);
String fn = path.getFileName().toString();
if (!fn.endsWith(".jar") && !fn.endsWith(".jmod")) {
throw new UnsupportedOperationException(path + " is not a modular JAR or jmod file");
diff --git a/src/java.base/share/classes/jdk/internal/module/ModulePath.java b/src/java.base/share/classes/jdk/internal/module/ModulePath.java
index e050fbd65d4..c2360546a2e 100644
--- a/src/java.base/share/classes/jdk/internal/module/ModulePath.java
+++ b/src/java.base/share/classes/jdk/internal/module/ModulePath.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2018, 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
@@ -43,7 +43,6 @@ import java.nio.file.DirectoryStream;
import java.nio.file.Files;
import java.nio.file.NoSuchFileException;
import java.nio.file.Path;
-import java.nio.file.Paths;
import java.nio.file.attribute.BasicFileAttributes;
import java.util.ArrayList;
import java.util.Collections;
@@ -360,7 +359,7 @@ public class ModulePath implements ModuleFinder {
URI uri = mref.location().orElse(null);
if (uri != null) {
if (uri.getScheme().equalsIgnoreCase("file")) {
- Path file = Paths.get(uri);
+ Path file = Path.of(uri);
return file.getFileName().toString();
} else {
return uri.toString();
diff --git a/src/java.base/share/classes/jdk/internal/module/SystemModuleFinders.java b/src/java.base/share/classes/jdk/internal/module/SystemModuleFinders.java
index 5fba5b39ae0..f50a8466dfa 100644
--- a/src/java.base/share/classes/jdk/internal/module/SystemModuleFinders.java
+++ b/src/java.base/share/classes/jdk/internal/module/SystemModuleFinders.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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
@@ -38,7 +38,6 @@ import java.net.URLConnection;
import java.nio.ByteBuffer;
import java.nio.file.Files;
import java.nio.file.Path;
-import java.nio.file.Paths;
import java.security.AccessController;
import java.security.PrivilegedAction;
import java.util.ArrayDeque;
@@ -185,7 +184,7 @@ public final class SystemModuleFinders {
// probe to see if this is an images build
String home = System.getProperty("java.home");
- Path modules = Paths.get(home, "lib", "modules");
+ Path modules = Path.of(home, "lib", "modules");
if (Files.isRegularFile(modules)) {
if (USE_FAST_PATH) {
SystemModules systemModules = allSystemModules();
@@ -205,7 +204,7 @@ public final class SystemModuleFinders {
}
// exploded build (do not cache module finder)
- Path dir = Paths.get(home, "modules");
+ Path dir = Path.of(home, "modules");
if (!Files.isDirectory(dir))
throw new InternalError("Unable to detect the run-time image");
ModuleFinder f = ModulePath.of(ModuleBootstrap.patcher(), dir);
diff --git a/src/java.base/share/classes/jdk/internal/perf/PerfCounter.java b/src/java.base/share/classes/jdk/internal/perf/PerfCounter.java
index 790bbeb7e48..ada97304389 100644
--- a/src/java.base/share/classes/jdk/internal/perf/PerfCounter.java
+++ b/src/java.base/share/classes/jdk/internal/perf/PerfCounter.java
@@ -133,10 +133,6 @@ public class PerfCounter {
static final PerfCounter zfot = newPerfCounter("sun.zip.zipFile.openTime");
}
- static class WindowsClientCounters {
- static final PerfCounter d3dAvailable = newConstantPerfCounter("sun.java2d.d3d.available");
- }
-
/**
* Number of findClass calls
*/
@@ -182,10 +178,4 @@ public class PerfCounter {
return CoreCounters.zfot;
}
- /**
- * D3D graphic pipeline available
- */
- public static PerfCounter getD3DAvailable() {
- return WindowsClientCounters.d3dAvailable;
- }
}
diff --git a/src/java.base/share/classes/module-info.java b/src/java.base/share/classes/module-info.java
index 3b1f998b4b1..7a290b0f0f9 100644
--- a/src/java.base/share/classes/module-info.java
+++ b/src/java.base/share/classes/module-info.java
@@ -159,8 +159,6 @@ module java.base {
jdk.scripting.nashorn;
exports jdk.internal.org.objectweb.asm.signature to
jdk.scripting.nashorn;
- exports jdk.internal.math to
- java.desktop;
exports jdk.internal.misc to
java.desktop,
java.logging,
@@ -188,7 +186,6 @@ module java.base {
jdk.jartool,
jdk.jlink;
exports jdk.internal.perf to
- java.desktop,
java.management,
jdk.management.agent,
jdk.internal.jvmstat;
@@ -235,7 +232,6 @@ module java.base {
jdk.sctp,
jdk.unsupported;
exports sun.nio.cs to
- java.desktop,
jdk.charsets;
exports sun.nio.fs to
jdk.unsupported;
diff --git a/src/java.base/share/classes/sun/net/www/MimeTable.java b/src/java.base/share/classes/sun/net/www/MimeTable.java
index 84d4ef9f7dc..44ca1335424 100644
--- a/src/java.base/share/classes/sun/net/www/MimeTable.java
+++ b/src/java.base/share/classes/sun/net/www/MimeTable.java
@@ -57,9 +57,6 @@ public class MimeTable implements FileNameMap {
"/etc/mailcap",
"/usr/etc/mailcap",
"/usr/local/etc/mailcap",
- System.getProperty("hotjava.home",
- "/usr/local/hotjava")
- + "/lib/mailcap",
};
return null;
}
diff --git a/src/java.base/share/classes/sun/nio/ch/AbstractPollSelectorImpl.java b/src/java.base/share/classes/sun/nio/ch/AbstractPollSelectorImpl.java
index 81fa9836a87..8d532da5d11 100644
--- a/src/java.base/share/classes/sun/nio/ch/AbstractPollSelectorImpl.java
+++ b/src/java.base/share/classes/sun/nio/ch/AbstractPollSelectorImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2018, 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
@@ -99,7 +99,6 @@ abstract class AbstractPollSelectorImpl
implCloseInterrupt();
pollWrapper.free();
pollWrapper = null;
- selectedKeys = null;
channelArray = null;
totalChannels = 0;
}
diff --git a/src/java.base/share/classes/sun/nio/ch/DatagramChannelImpl.java b/src/java.base/share/classes/sun/nio/ch/DatagramChannelImpl.java
index 098084bd049..625317356a6 100644
--- a/src/java.base/share/classes/sun/nio/ch/DatagramChannelImpl.java
+++ b/src/java.base/share/classes/sun/nio/ch/DatagramChannelImpl.java
@@ -508,8 +508,7 @@ class DatagramChannelImpl
if (remote != null) {
// connected
if (!target.equals(remote)) {
- throw new IllegalArgumentException(
- "Connected address not equal to target address");
+ throw new AlreadyConnectedException();
}
do {
n = IOUtil.write(fd, src, -1, nd);
diff --git a/src/java.base/share/classes/sun/nio/ch/IOUtil.java b/src/java.base/share/classes/sun/nio/ch/IOUtil.java
index 06c426d27bd..0ca8be02e18 100644
--- a/src/java.base/share/classes/sun/nio/ch/IOUtil.java
+++ b/src/java.base/share/classes/sun/nio/ch/IOUtil.java
@@ -397,7 +397,9 @@ public class IOUtil {
* The read end of the pipe is returned in the high 32 bits,
* while the write end is returned in the low 32 bits.
*/
- static native long makePipe(boolean blocking);
+ static native long makePipe(boolean blocking) throws IOException;
+
+ static native int write1(int fd, byte b) throws IOException;
static native boolean drain(int fd) throws IOException;
diff --git a/src/java.base/share/classes/sun/nio/ch/SelChImpl.java b/src/java.base/share/classes/sun/nio/ch/SelChImpl.java
index 095dfd5a71c..829083374ba 100644
--- a/src/java.base/share/classes/sun/nio/ch/SelChImpl.java
+++ b/src/java.base/share/classes/sun/nio/ch/SelChImpl.java
@@ -63,8 +63,6 @@ public interface SelChImpl extends Channel {
void translateAndSetInterestOps(int ops, SelectionKeyImpl sk);
- int validOps();
-
void kill() throws IOException;
}
diff --git a/src/java.base/share/classes/sun/nio/ch/SelectionKeyImpl.java b/src/java.base/share/classes/sun/nio/ch/SelectionKeyImpl.java
index 28102d78fcf..d4b4c39297d 100644
--- a/src/java.base/share/classes/sun/nio/ch/SelectionKeyImpl.java
+++ b/src/java.base/share/classes/sun/nio/ch/SelectionKeyImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2018, 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
@@ -25,16 +25,18 @@
package sun.nio.ch;
-import java.io.IOException;
-import java.nio.channels.*;
-import java.nio.channels.spi.*;
+import java.nio.channels.CancelledKeyException;
+import java.nio.channels.SelectableChannel;
+import java.nio.channels.SelectionKey;
+import java.nio.channels.Selector;
+import java.nio.channels.spi.AbstractSelectionKey;
/**
- * An implementation of SelectionKey for Solaris.
+ * An implementation of SelectionKey.
*/
-public class SelectionKeyImpl
+public final class SelectionKeyImpl
extends AbstractSelectionKey
{
@@ -45,19 +47,21 @@ public class SelectionKeyImpl
private int index;
private volatile int interestOps;
- private int readyOps;
+ private volatile int readyOps;
SelectionKeyImpl(SelChImpl ch, SelectorImpl sel) {
channel = ch;
selector = sel;
}
+ @Override
public SelectableChannel channel() {
return (SelectableChannel)channel;
}
+ @Override
public Selector selector() {
- return selector;
+ return (Selector)selector;
}
int getIndex() { // package-private
@@ -73,16 +77,19 @@ public class SelectionKeyImpl
throw new CancelledKeyException();
}
+ @Override
public int interestOps() {
ensureValid();
return interestOps;
}
+ @Override
public SelectionKey interestOps(int ops) {
ensureValid();
return nioInterestOps(ops);
}
+ @Override
public int readyOps() {
ensureValid();
return readyOps;
@@ -111,4 +118,24 @@ public class SelectionKeyImpl
return interestOps;
}
+ @Override
+ public String toString() {
+ StringBuilder sb = new StringBuilder();
+ sb.append("channel=")
+ .append(channel)
+ .append(", selector=")
+ .append(selector);
+ if (isValid()) {
+ sb.append(", interestOps=")
+ .append(interestOps)
+ .append(", readyOps=")
+ .append(readyOps);
+ } else {
+ sb.append(", invalid");
+ }
+ return sb.toString();
+ }
+
+ // used by Selector implementations to record when the key was selected
+ int lastPolled;
}
diff --git a/src/java.base/share/classes/sun/nio/ch/SelectorImpl.java b/src/java.base/share/classes/sun/nio/ch/SelectorImpl.java
index 3c3f5fc42f0..028c47c1840 100644
--- a/src/java.base/share/classes/sun/nio/ch/SelectorImpl.java
+++ b/src/java.base/share/classes/sun/nio/ch/SelectorImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2018, 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
@@ -30,7 +30,6 @@ import java.net.SocketException;
import java.nio.channels.ClosedSelectorException;
import java.nio.channels.IllegalSelectorException;
import java.nio.channels.SelectionKey;
-import java.nio.channels.Selector;
import java.nio.channels.spi.AbstractSelectableChannel;
import java.nio.channels.spi.AbstractSelector;
import java.nio.channels.spi.SelectorProvider;
@@ -47,16 +46,15 @@ import java.util.Set;
public abstract class SelectorImpl
extends AbstractSelector
{
+ // The set of keys registered with this Selector
+ protected final HashSet keys;
// The set of keys with data ready for an operation
- protected Set selectedKeys;
-
- // The set of keys registered with this Selector
- protected HashSet keys;
+ protected final Set selectedKeys;
// Public views of the key sets
- private Set publicKeys; // Immutable
- private Set publicSelectedKeys; // Removal allowed, but not addition
+ private final Set publicKeys; // Immutable
+ private final Set publicSelectedKeys; // Removal allowed, but not addition
protected SelectorImpl(SelectorProvider sp) {
super(sp);
@@ -66,18 +64,30 @@ public abstract class SelectorImpl
publicSelectedKeys = Util.ungrowableSet(selectedKeys);
}
- public Set keys() {
+ @Override
+ public final Set keys() {
if (!isOpen())
throw new ClosedSelectorException();
return publicKeys;
}
- public Set selectedKeys() {
+ @Override
+ public final Set selectedKeys() {
if (!isOpen())
throw new ClosedSelectorException();
return publicSelectedKeys;
}
+ /**
+ * Returns the public view of the key sets
+ */
+ protected final Set nioKeys() {
+ return publicKeys;
+ }
+ protected final Set nioSelectedKeys() {
+ return publicSelectedKeys;
+ }
+
protected abstract int doSelect(long timeout) throws IOException;
private int lockAndDoSelect(long timeout) throws IOException {
@@ -92,7 +102,8 @@ public abstract class SelectorImpl
}
}
- public int select(long timeout)
+ @Override
+ public final int select(long timeout)
throws IOException
{
if (timeout < 0)
@@ -100,15 +111,18 @@ public abstract class SelectorImpl
return lockAndDoSelect((timeout == 0) ? -1 : timeout);
}
- public int select() throws IOException {
+ @Override
+ public final int select() throws IOException {
return select(0);
}
- public int selectNow() throws IOException {
+ @Override
+ public final int selectNow() throws IOException {
return lockAndDoSelect(0);
}
- public void implCloseSelector() throws IOException {
+ @Override
+ public final void implCloseSelector() throws IOException {
wakeup();
synchronized (this) {
synchronized (publicKeys) {
@@ -121,8 +135,7 @@ public abstract class SelectorImpl
protected abstract void implClose() throws IOException;
- public void putEventOps(SelectionKeyImpl sk, int ops) { }
-
+ @Override
protected final SelectionKey register(AbstractSelectableChannel ch,
int ops,
Object attachment)
@@ -140,7 +153,9 @@ public abstract class SelectorImpl
protected abstract void implRegister(SelectionKeyImpl ski);
- void processDeregisterQueue() throws IOException {
+ protected abstract void implDereg(SelectionKeyImpl ski) throws IOException;
+
+ protected final void processDeregisterQueue() throws IOException {
// Precondition: Synchronized on this, keys, and selectedKeys
Set cks = cancelledKeys();
synchronized (cks) {
@@ -160,8 +175,8 @@ public abstract class SelectorImpl
}
}
- protected abstract void implDereg(SelectionKeyImpl ski) throws IOException;
-
- public abstract Selector wakeup();
-
+ /**
+ * Invoked to change the key's interest set
+ */
+ public abstract void putEventOps(SelectionKeyImpl ski, int ops);
}
diff --git a/src/java.base/share/classes/sun/nio/ch/ServerSocketChannelImpl.java b/src/java.base/share/classes/sun/nio/ch/ServerSocketChannelImpl.java
index 4eeca465384..e8271f1a74b 100644
--- a/src/java.base/share/classes/sun/nio/ch/ServerSocketChannelImpl.java
+++ b/src/java.base/share/classes/sun/nio/ch/ServerSocketChannelImpl.java
@@ -210,25 +210,20 @@ class ServerSocketChannelImpl
@Override
public ServerSocketChannel bind(SocketAddress local, int backlog) throws IOException {
- acceptLock.lock();
- try {
- synchronized (stateLock) {
- ensureOpen();
- if (localAddress != null)
- throw new AlreadyBoundException();
- InetSocketAddress isa = (local == null)
- ? new InetSocketAddress(0)
- : Net.checkAddress(local);
- SecurityManager sm = System.getSecurityManager();
- if (sm != null)
- sm.checkListen(isa.getPort());
- NetHooks.beforeTcpBind(fd, isa.getAddress(), isa.getPort());
- Net.bind(fd, isa.getAddress(), isa.getPort());
- Net.listen(fd, backlog < 1 ? 50 : backlog);
- localAddress = Net.localAddress(fd);
- }
- } finally {
- acceptLock.unlock();
+ synchronized (stateLock) {
+ ensureOpen();
+ if (localAddress != null)
+ throw new AlreadyBoundException();
+ InetSocketAddress isa = (local == null)
+ ? new InetSocketAddress(0)
+ : Net.checkAddress(local);
+ SecurityManager sm = System.getSecurityManager();
+ if (sm != null)
+ sm.checkListen(isa.getPort());
+ NetHooks.beforeTcpBind(fd, isa.getAddress(), isa.getPort());
+ Net.bind(fd, isa.getAddress(), isa.getPort());
+ Net.listen(fd, backlog < 1 ? 50 : backlog);
+ localAddress = Net.localAddress(fd);
}
return this;
}
diff --git a/src/java.base/share/classes/sun/nio/ch/SocketChannelImpl.java b/src/java.base/share/classes/sun/nio/ch/SocketChannelImpl.java
index 64040edca4e..b1f085abb1b 100644
--- a/src/java.base/share/classes/sun/nio/ch/SocketChannelImpl.java
+++ b/src/java.base/share/classes/sun/nio/ch/SocketChannelImpl.java
@@ -96,7 +96,7 @@ class SocketChannelImpl
private static final int ST_CLOSING = 3;
private static final int ST_KILLPENDING = 4;
private static final int ST_KILLED = 5;
- private int state;
+ private volatile int state; // need stateLock to change
// IDs of native threads doing reads and writes, for signalling
private long readerThread;
@@ -148,12 +148,37 @@ class SocketChannelImpl
}
}
- // @throws ClosedChannelException if channel is closed
+ /**
+ * Checks that the channel is open.
+ *
+ * @throws ClosedChannelException if channel is closed (or closing)
+ */
private void ensureOpen() throws ClosedChannelException {
if (!isOpen())
throw new ClosedChannelException();
}
+ /**
+ * Checks that the channel is open and connected.
+ *
+ * @apiNote This method uses the "state" field to check if the channel is
+ * open. It should never be used in conjuncion with isOpen or ensureOpen
+ * as these methods check AbstractInterruptibleChannel's closed field - that
+ * field is set before implCloseSelectableChannel is called and so before
+ * the state is changed.
+ *
+ * @throws ClosedChannelException if channel is closed (or closing)
+ * @throws NotYetConnectedException if open and not connected
+ */
+ private void ensureOpenAndConnected() throws ClosedChannelException {
+ int state = this.state;
+ if (state < ST_CONNECTED) {
+ throw new NotYetConnectedException();
+ } else if (state > ST_CONNECTED) {
+ throw new ClosedChannelException();
+ }
+ }
+
@Override
public Socket socket() {
synchronized (stateLock) {
@@ -275,13 +300,14 @@ class SocketChannelImpl
if (blocking) {
// set hook for Thread.interrupt
begin();
- }
- synchronized (stateLock) {
- ensureOpen();
- if (state != ST_CONNECTED)
- throw new NotYetConnectedException();
- if (blocking)
+
+ synchronized (stateLock) {
+ ensureOpenAndConnected();
+ // record thread so it can be signalled if needed
readerThread = NativeThread.current();
+ }
+ } else {
+ ensureOpenAndConnected();
}
}
@@ -385,15 +411,16 @@ class SocketChannelImpl
if (blocking) {
// set hook for Thread.interrupt
begin();
- }
- synchronized (stateLock) {
- ensureOpen();
- if (isOutputClosed)
- throw new ClosedChannelException();
- if (state != ST_CONNECTED)
- throw new NotYetConnectedException();
- if (blocking)
+
+ synchronized (stateLock) {
+ ensureOpenAndConnected();
+ if (isOutputClosed)
+ throw new ClosedChannelException();
+ // record thread so it can be signalled if needed
writerThread = NativeThread.current();
+ }
+ } else {
+ ensureOpenAndConnected();
}
}
@@ -574,38 +601,48 @@ class SocketChannelImpl
@Override
public boolean isConnected() {
- synchronized (stateLock) {
- return (state == ST_CONNECTED);
- }
+ return (state == ST_CONNECTED);
}
@Override
public boolean isConnectionPending() {
- synchronized (stateLock) {
- return (state == ST_CONNECTIONPENDING);
- }
+ return (state == ST_CONNECTIONPENDING);
}
/**
* Marks the beginning of a connect operation that might block.
- *
+ * @param blocking true if configured blocking
+ * @param isa the remote address
* @throws ClosedChannelException if the channel is closed
* @throws AlreadyConnectedException if already connected
* @throws ConnectionPendingException is a connection is pending
+ * @throws IOException if the pre-connect hook fails
*/
- private void beginConnect(boolean blocking) throws ClosedChannelException {
+ private void beginConnect(boolean blocking, InetSocketAddress isa)
+ throws IOException
+ {
if (blocking) {
// set hook for Thread.interrupt
begin();
}
synchronized (stateLock) {
ensureOpen();
+ int state = this.state;
if (state == ST_CONNECTED)
throw new AlreadyConnectedException();
if (state == ST_CONNECTIONPENDING)
throw new ConnectionPendingException();
- if (blocking)
+ assert state == ST_UNCONNECTED;
+ this.state = ST_CONNECTIONPENDING;
+
+ if (localAddress == null)
+ NetHooks.beforeTcpConnect(fd, isa.getAddress(), isa.getPort());
+ remoteAddress = isa;
+
+ if (blocking) {
+ // record thread so it can be signalled if needed
readerThread = NativeThread.current();
+ }
}
}
@@ -614,11 +651,21 @@ class SocketChannelImpl
*
* @throws AsynchronousCloseException if the channel was closed due to this
* thread being interrupted on a blocking connect operation.
+ * @throws IOException if completed and unable to obtain the local address
*/
private void endConnect(boolean blocking, boolean completed)
- throws AsynchronousCloseException
+ throws IOException
{
endRead(blocking, completed);
+
+ if (completed) {
+ synchronized (stateLock) {
+ if (state == ST_CONNECTIONPENDING) {
+ localAddress = Net.localAddress(fd);
+ state = ST_CONNECTED;
+ }
+ }
+ }
}
@Override
@@ -628,64 +675,37 @@ class SocketChannelImpl
if (sm != null)
sm.checkConnect(isa.getAddress().getHostAddress(), isa.getPort());
- readLock.lock();
+ InetAddress ia = isa.getAddress();
+ if (ia.isAnyLocalAddress())
+ ia = InetAddress.getLocalHost();
+
try {
- writeLock.lock();
+ readLock.lock();
try {
- // notify before-connect hook
- synchronized (stateLock) {
- if (state == ST_UNCONNECTED && localAddress == null) {
- NetHooks.beforeTcpConnect(fd, isa.getAddress(), isa.getPort());
- }
- }
-
- InetAddress ia = isa.getAddress();
- if (ia.isAnyLocalAddress())
- ia = InetAddress.getLocalHost();
-
- int n = 0;
- boolean blocking = isBlocking();
+ writeLock.lock();
try {
+ int n = 0;
+ boolean blocking = isBlocking();
try {
- beginConnect(blocking);
- if (blocking) {
- do {
- n = Net.connect(fd, ia, isa.getPort());
- } while (n == IOStatus.INTERRUPTED && isOpen());
- } else {
+ beginConnect(blocking, isa);
+ do {
n = Net.connect(fd, ia, isa.getPort());
- }
+ } while (n == IOStatus.INTERRUPTED && isOpen());
} finally {
- endConnect(blocking, n > 0);
- }
- } catch (IOException x) {
- // connect failed, close socket
- close();
- throw x;
- }
-
- // connection may be established
- synchronized (stateLock) {
- if (!isOpen())
- throw new AsynchronousCloseException();
- remoteAddress = isa;
- if (n > 0) {
- // connected established
- localAddress = Net.localAddress(fd);
- state = ST_CONNECTED;
- return true;
- } else {
- // connection pending
- assert !blocking;
- state = ST_CONNECTIONPENDING;
- return false;
+ endConnect(blocking, (n > 0));
}
+ assert IOStatus.check(n);
+ return n > 0;
+ } finally {
+ writeLock.unlock();
}
} finally {
- writeLock.unlock();
+ readLock.unlock();
}
- } finally {
- readLock.unlock();
+ } catch (IOException ioe) {
+ // connect failed, close the channel
+ close();
+ throw ioe;
}
}
@@ -704,8 +724,10 @@ class SocketChannelImpl
ensureOpen();
if (state != ST_CONNECTIONPENDING)
throw new NoConnectionPendingException();
- if (blocking)
+ if (blocking) {
+ // record thread so it can be signalled if needed
readerThread = NativeThread.current();
+ }
}
}
@@ -714,65 +736,62 @@ class SocketChannelImpl
*
* @throws AsynchronousCloseException if the channel was closed due to this
* thread being interrupted on a blocking connect operation.
+ * @throws IOException if completed and unable to obtain the local address
*/
private void endFinishConnect(boolean blocking, boolean completed)
- throws AsynchronousCloseException
+ throws IOException
{
endRead(blocking, completed);
+
+ if (completed) {
+ synchronized (stateLock) {
+ if (state == ST_CONNECTIONPENDING) {
+ localAddress = Net.localAddress(fd);
+ state = ST_CONNECTED;
+ }
+ }
+ }
}
@Override
public boolean finishConnect() throws IOException {
- readLock.lock();
try {
- writeLock.lock();
+ readLock.lock();
try {
- // already connected?
- synchronized (stateLock) {
- if (state == ST_CONNECTED)
- return true;
- }
-
- int n = 0;
- boolean blocking = isBlocking();
+ writeLock.lock();
try {
+ // no-op if already connected
+ if (isConnected())
+ return true;
+
+ boolean blocking = isBlocking();
+ boolean connected = false;
try {
beginFinishConnect(blocking);
+ int n = 0;
if (blocking) {
do {
n = checkConnect(fd, true);
- } while (n == 0 || (n == IOStatus.INTERRUPTED) && isOpen());
+ } while ((n == 0 || n == IOStatus.INTERRUPTED) && isOpen());
} else {
n = checkConnect(fd, false);
}
+ connected = (n > 0);
} finally {
- endFinishConnect(blocking, n > 0);
- }
- } catch (IOException x) {
- close();
- throw x;
- }
-
- // post finishConnect, connection may be established
- synchronized (stateLock) {
- if (!isOpen())
- throw new AsynchronousCloseException();
- if (n > 0) {
- // connection established
- localAddress = Net.localAddress(fd);
- state = ST_CONNECTED;
- return true;
- } else {
- // connection still pending
- assert !blocking;
- return false;
+ endFinishConnect(blocking, connected);
}
+ assert (blocking && connected) ^ !blocking;
+ return connected;
+ } finally {
+ writeLock.unlock();
}
} finally {
- writeLock.unlock();
+ readLock.unlock();
}
- } finally {
- readLock.unlock();
+ } catch (IOException ioe) {
+ // connect failed, close the channel
+ close();
+ throw ioe;
}
}
@@ -994,20 +1013,17 @@ class SocketChannelImpl
return (newOps & ~oldOps) != 0;
}
+ boolean connected = isConnected();
if (((ops & Net.POLLIN) != 0) &&
- ((intOps & SelectionKey.OP_READ) != 0) &&
- (state == ST_CONNECTED))
+ ((intOps & SelectionKey.OP_READ) != 0) && connected)
newOps |= SelectionKey.OP_READ;
if (((ops & Net.POLLCONN) != 0) &&
- ((intOps & SelectionKey.OP_CONNECT) != 0) &&
- ((state == ST_UNCONNECTED) || (state == ST_CONNECTIONPENDING))) {
+ ((intOps & SelectionKey.OP_CONNECT) != 0) && isConnectionPending())
newOps |= SelectionKey.OP_CONNECT;
- }
if (((ops & Net.POLLOUT) != 0) &&
- ((intOps & SelectionKey.OP_WRITE) != 0) &&
- (state == ST_CONNECTED))
+ ((intOps & SelectionKey.OP_WRITE) != 0) && connected)
newOps |= SelectionKey.OP_WRITE;
sk.nioReadyOps(newOps);
diff --git a/src/java.base/share/classes/sun/security/provider/AuthPolicyFile.java b/src/java.base/share/classes/sun/security/provider/AuthPolicyFile.java
deleted file mode 100644
index 1626f48ccb7..00000000000
--- a/src/java.base/share/classes/sun/security/provider/AuthPolicyFile.java
+++ /dev/null
@@ -1,1197 +0,0 @@
-/*
- * Copyright (c) 1999, 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.security.provider;
-
-import java.io.*;
-import java.lang.reflect.*;
-import java.net.URL;
-import java.util.*;
-
-import java.security.AccessController;
-import java.security.CodeSource;
-import java.security.KeyStore;
-import java.security.KeyStoreException;
-import java.security.Permission;
-import java.security.Permissions;
-import java.security.PermissionCollection;
-import java.security.Principal;
-import java.security.PrivilegedAction;
-import java.security.UnresolvedPermission;
-import java.security.Security;
-import java.security.cert.Certificate;
-import java.security.cert.X509Certificate;
-
-import javax.security.auth.Subject;
-import javax.security.auth.PrivateCredentialPermission;
-
-import sun.security.provider.PolicyParser.GrantEntry;
-import sun.security.provider.PolicyParser.PermissionEntry;
-import sun.security.provider.PolicyParser.PrincipalEntry;
-import sun.security.util.Debug;
-import sun.security.util.PolicyUtil;
-import sun.security.util.PropertyExpander;
-
-/**
- * See {@code com.sun.security.auth.PolicyFile} for the class description.
- * This class is necessary in order to support a default
- * {@code javax.security.auth.Policy} implementation on the compact1 and
- * compact2 profiles.
- *
- * @deprecated As of JDK 1.4, replaced by
- * {@code sun.security.provider.PolicyFile}.
- * This class is entirely deprecated.
- */
-@Deprecated
-@SuppressWarnings("removal")
-public class AuthPolicyFile extends javax.security.auth.Policy {
-
- static final ResourceBundle rb =
- AccessController.doPrivileged(new PrivilegedAction() {
- @Override public ResourceBundle run() {
- return (ResourceBundle.getBundle
- ("sun.security.util.AuthResources"));
- }
- });
-
- private static final Debug debug = Debug.getInstance("policy",
- "\t[Auth Policy]");
-
- private static final String AUTH_POLICY = "java.security.auth.policy";
- private static final String SECURITY_MANAGER = "java.security.manager";
- private static final String AUTH_POLICY_URL = "auth.policy.url.";
-
- private Vector policyEntries;
- private Hashtable aliasMapping;
-
- private boolean initialized = false;
-
- private boolean expandProperties = true;
- private boolean ignoreIdentityScope = true;
-
- // for use with the reflection API
- private static final Class[] PARAMS = { String.class, String.class};
-
- /**
- * Initializes the Policy object and reads the default policy
- * configuration file(s) into the Policy object.
- */
- public AuthPolicyFile() {
- // initialize Policy if either the AUTH_POLICY or
- // SECURITY_MANAGER properties are set
- String prop = System.getProperty(AUTH_POLICY);
-
- if (prop == null) {
- prop = System.getProperty(SECURITY_MANAGER);
- }
- if (prop != null) {
- init();
- }
- }
-
- private synchronized void init() {
- if (initialized) {
- return;
- }
-
- policyEntries = new Vector();
- aliasMapping = new Hashtable(11);
-
- initPolicyFile();
- initialized = true;
- }
-
- @Override
- public synchronized void refresh() {
-
- java.lang.SecurityManager sm = System.getSecurityManager();
- if (sm != null) {
- sm.checkPermission(new javax.security.auth.AuthPermission
- ("refreshPolicy"));
- }
-
- // XXX
- //
- // 1) if code instantiates PolicyFile directly, then it will need
- // all the permissions required for the PolicyFile initialization
- // 2) if code calls Policy.getPolicy, then it simply needs
- // AuthPermission(getPolicy), and the javax.security.auth.Policy
- // implementation instantiates PolicyFile in a doPrivileged block
- // 3) if after instantiating a Policy (either via #1 or #2),
- // code calls refresh, it simply needs
- // AuthPermission(refreshPolicy). then PolicyFile wraps
- // the refresh in a doPrivileged block.
- initialized = false;
- AccessController.doPrivileged(new PrivilegedAction() {
- @Override public Void run() {
- init();
- return null;
- }
- });
- }
-
- private KeyStore initKeyStore(URL policyUrl, String keyStoreName,
- String keyStoreType) {
- if (keyStoreName != null) {
- try {
- /*
- * location of keystore is specified as absolute URL in policy
- * file, or is relative to URL of policy file
- */
- URL keyStoreUrl = null;
- try {
- keyStoreUrl = new URL(keyStoreName);
- // absolute URL
- } catch (java.net.MalformedURLException e) {
- // relative URL
- keyStoreUrl = new URL(policyUrl, keyStoreName);
- }
-
- if (debug != null) {
- debug.println("reading keystore"+keyStoreUrl);
- }
-
- InputStream inStream = new BufferedInputStream(
- PolicyUtil.getInputStream(keyStoreUrl));
-
- KeyStore ks;
- if (keyStoreType != null)
- ks = KeyStore.getInstance(keyStoreType);
- else
- ks = KeyStore.getInstance(KeyStore.getDefaultType());
- ks.load(inStream, null);
- inStream.close();
- return ks;
- } catch (Exception e) {
- // ignore, treat it like we have no keystore
- if (debug != null) {
- debug.println("Debug info only. No keystore.");
- e.printStackTrace();
- }
- return null;
- }
- }
- return null;
- }
-
- private void initPolicyFile() {
-
- String prop = Security.getProperty("policy.expandProperties");
- if (prop != null) {
- expandProperties = prop.equalsIgnoreCase("true");
- }
-
- String iscp = Security.getProperty("policy.ignoreIdentityScope");
- if (iscp != null) {
- ignoreIdentityScope = iscp.equalsIgnoreCase("true");
- }
-
- String allowSys = Security.getProperty("policy.allowSystemProperty");
- if (allowSys != null && allowSys.equalsIgnoreCase("true")) {
- String extra_policy = System.getProperty(AUTH_POLICY);
- if (extra_policy != null) {
- boolean overrideAll = false;
- if (extra_policy.startsWith("=")) {
- overrideAll = true;
- extra_policy = extra_policy.substring(1);
- }
- try {
- extra_policy = PropertyExpander.expand(extra_policy);
- URL policyURL;
- File policyFile = new File(extra_policy);
- if (policyFile.exists()) {
- policyURL =
- new URL("file:" + policyFile.getCanonicalPath());
- } else {
- policyURL = new URL(extra_policy);
- }
- if (debug != null) {
- debug.println("reading " + policyURL);
- }
- init(policyURL);
- } catch (Exception e) {
- // ignore.
- if (debug != null) {
- debug.println("caught exception: " + e);
- }
-
- }
- if (overrideAll) {
- if (debug != null) {
- debug.println("overriding other policies!");
- }
- return;
- }
- }
- }
-
- int n = 1;
- boolean loaded_one = false;
- String policy_url;
-
- while ((policy_url = Security.getProperty(AUTH_POLICY_URL+n)) != null) {
- try {
- policy_url = PropertyExpander.expand(policy_url).replace
- (File.separatorChar, '/');
- if (debug != null) {
- debug.println("reading " + policy_url);
- }
- init(new URL(policy_url));
- loaded_one = true;
- } catch (Exception e) {
- if (debug != null) {
- debug.println("Debug info only. Error reading policy " + e);
- e.printStackTrace();
- }
- // ignore that policy
- }
- n++;
- }
-
- if (loaded_one == false) {
- // do not load a static policy
- }
- }
-
- /**
- * Checks public key. If it is marked as trusted in
- * the identity database, add it to the policy
- * with the AllPermission.
- */
- private boolean checkForTrustedIdentity(final Certificate cert) {
- return false;
- }
-
- /**
- * Reads a policy configuration into the Policy object using a
- * Reader object.
- *
- * @param policyFile the policy Reader object.
- */
- private void init(URL policy) {
- PolicyParser pp = new PolicyParser(expandProperties);
- try (InputStreamReader isr
- = new InputStreamReader(PolicyUtil.getInputStream(policy))) {
- pp.read(isr);
- KeyStore keyStore = initKeyStore(policy, pp.getKeyStoreUrl(),
- pp.getKeyStoreType());
- Enumeration enum_ = pp.grantElements();
- while (enum_.hasMoreElements()) {
- GrantEntry ge = enum_.nextElement();
- addGrantEntry(ge, keyStore);
- }
- } catch (PolicyParser.ParsingException pe) {
- System.err.println(AUTH_POLICY +
- rb.getString(".error.parsing.") + policy);
- System.err.println(AUTH_POLICY + rb.getString("COLON") +
- pe.getMessage());
- if (debug != null) {
- pe.printStackTrace();
- }
- } catch (Exception e) {
- if (debug != null) {
- debug.println("error parsing " + policy);
- debug.println(e.toString());
- e.printStackTrace();
- }
- }
- }
-
- /**
- * Given a PermissionEntry, create a codeSource.
- *
- * @return null if signedBy alias is not recognized
- */
- CodeSource getCodeSource(GrantEntry ge, KeyStore keyStore)
- throws java.net.MalformedURLException
- {
- Certificate[] certs = null;
- if (ge.signedBy != null) {
- certs = getCertificates(keyStore, ge.signedBy);
- if (certs == null) {
- // we don't have a key for this alias,
- // just return
- if (debug != null) {
- debug.println(" no certs for alias " +
- ge.signedBy + ", ignoring.");
- }
- return null;
- }
- }
-
- URL location;
- if (ge.codeBase != null) {
- location = new URL(ge.codeBase);
- } else {
- location = null;
- }
-
- if (ge.principals == null || ge.principals.size() == 0) {
- return (canonicalizeCodebase
- (new CodeSource(location, certs),
- false));
- } else {
- return (canonicalizeCodebase
- (new SubjectCodeSource(null, ge.principals, location, certs),
- false));
- }
- }
-
- /**
- * Add one policy entry to the vector.
- */
- private void addGrantEntry(GrantEntry ge, KeyStore keyStore) {
-
- if (debug != null) {
- debug.println("Adding policy entry: ");
- debug.println(" signedBy " + ge.signedBy);
- debug.println(" codeBase " + ge.codeBase);
- if (ge.principals != null) {
- for (PrincipalEntry pppe : ge.principals) {
- debug.println(" " + pppe.getPrincipalClass() +
- " " + pppe.getPrincipalName());
- }
- }
- debug.println();
- }
-
- try {
- CodeSource codesource = getCodeSource(ge, keyStore);
- // skip if signedBy alias was unknown...
- if (codesource == null) return;
-
- PolicyEntry entry = new PolicyEntry(codesource);
- Enumeration enum_ = ge.permissionElements();
- while (enum_.hasMoreElements()) {
- PermissionEntry pe = enum_.nextElement();
- try {
- // XXX special case PrivateCredentialPermission-SELF
- Permission perm;
- if (pe.permission.equals
- ("javax.security.auth.PrivateCredentialPermission") &&
- pe.name.endsWith(" self")) {
- perm = getInstance(pe.permission,
- pe.name + " \"self\"",
- pe.action);
- } else {
- perm = getInstance(pe.permission,
- pe.name,
- pe.action);
- }
- entry.add(perm);
- if (debug != null) {
- debug.println(" "+perm);
- }
- } catch (ClassNotFoundException cnfe) {
- Certificate[] certs;
- if (pe.signedBy != null) {
- certs = getCertificates(keyStore, pe.signedBy);
- } else {
- certs = null;
- }
-
- // only add if we had no signer or we had
- // a signer and found the keys for it.
- if (certs != null || pe.signedBy == null) {
- Permission perm = new UnresolvedPermission(
- pe.permission,
- pe.name,
- pe.action,
- certs);
- entry.add(perm);
- if (debug != null) {
- debug.println(" "+perm);
- }
- }
- } catch (java.lang.reflect.InvocationTargetException ite) {
- System.err.println
- (AUTH_POLICY +
- rb.getString(".error.adding.Permission.") +
- pe.permission +
- rb.getString("SPACE") +
- ite.getTargetException());
- } catch (Exception e) {
- System.err.println
- (AUTH_POLICY +
- rb.getString(".error.adding.Permission.") +
- pe.permission +
- rb.getString("SPACE") +
- e);
- }
- }
- policyEntries.addElement(entry);
- } catch (Exception e) {
- System.err.println
- (AUTH_POLICY +
- rb.getString(".error.adding.Entry.") +
- ge +
- rb.getString("SPACE") +
- e);
- }
-
- if (debug != null) {
- debug.println();
- }
- }
-
- /**
- * Returns a new Permission object of the given Type. The Permission is
- * created by getting the
- * Class object using the Class.forName method, and using
- * the reflection API to invoke the (String name, String actions)
- * constructor on the
- * object.
- *
- * @param type the type of Permission being created.
- * @param name the name of the Permission being created.
- * @param actions the actions of the Permission being created.
- *
- * @exception ClassNotFoundException if the particular Permission
- * class could not be found.
- *
- * @exception IllegalAccessException if the class or initializer is
- * not accessible.
- *
- * @exception InstantiationException if getInstance tries to
- * instantiate an abstract class or an interface, or if the
- * instantiation fails for some other reason.
- *
- * @exception NoSuchMethodException if the (String, String) constructor
- * is not found.
- *
- * @exception InvocationTargetException if the underlying Permission
- * constructor throws an exception.
- *
- */
- private static final Permission getInstance(String type,
- String name,
- String actions)
- throws ClassNotFoundException,
- InstantiationException,
- IllegalAccessException,
- NoSuchMethodException,
- InvocationTargetException
- {
- //XXX we might want to keep a hash of created factories...
- Class pc = Class.forName(type);
- Constructor c = pc.getConstructor(PARAMS);
- return (Permission) c.newInstance(new Object[] { name, actions });
- }
-
- /**
- * Fetch all certs associated with this alias.
- */
- Certificate[] getCertificates(KeyStore keyStore, String aliases) {
-
- Vector vcerts = null;
-
- StringTokenizer st = new StringTokenizer(aliases, ",");
- int n = 0;
-
- while (st.hasMoreTokens()) {
- String alias = st.nextToken().trim();
- n++;
- Certificate cert = null;
- // See if this alias's cert has already been cached
- cert = (Certificate) aliasMapping.get(alias);
- if (cert == null && keyStore != null) {
-
- try {
- cert = keyStore.getCertificate(alias);
- } catch (KeyStoreException kse) {
- // never happens, because keystore has already been loaded
- // when we call this
- }
- if (cert != null) {
- aliasMapping.put(alias, cert);
- aliasMapping.put(cert, alias);
- }
- }
-
- if (cert != null) {
- if (vcerts == null) {
- vcerts = new Vector();
- }
- vcerts.addElement(cert);
- }
- }
-
- // make sure n == vcerts.size, since we are doing a logical *and*
- if (vcerts != null && n == vcerts.size()) {
- Certificate[] certs = new Certificate[vcerts.size()];
- vcerts.copyInto(certs);
- return certs;
- } else {
- return null;
- }
- }
-
- /**
- * Enumerate all the entries in the global policy object.
- * This method is used by policy admin tools. The tools
- * should use the Enumeration methods on the returned object
- * to fetch the elements sequentially.
- */
- private final synchronized Enumeration elements() {
- return policyEntries.elements();
- }
-
- @Override
- public PermissionCollection getPermissions(final Subject subject,
- final CodeSource codesource) {
-
- // 1) if code instantiates PolicyFile directly, then it will need
- // all the permissions required for the PolicyFile initialization
- // 2) if code calls Policy.getPolicy, then it simply needs
- // AuthPermission(getPolicy), and the javax.security.auth.Policy
- // implementation instantiates PolicyFile in a doPrivileged block
- // 3) if after instantiating a Policy (either via #1 or #2),
- // code calls getPermissions, PolicyFile wraps the call
- // in a doPrivileged block.
- return AccessController.doPrivileged
- (new PrivilegedAction() {
- @Override public PermissionCollection run() {
- SubjectCodeSource scs = new SubjectCodeSource(
- subject, null,
- codesource == null ? null : codesource.getLocation(),
- codesource == null ? null : codesource.getCertificates());
- if (initialized) {
- return getPermissions(new Permissions(), scs);
- } else {
- return new PolicyPermissions(AuthPolicyFile.this, scs);
- }
- }
- });
- }
-
- /**
- * Examines the global policy for the specified CodeSource, and
- * creates a PermissionCollection object with
- * the set of permissions for that principal's protection domain.
- *
- * @param CodeSource the codesource associated with the caller.
- * This encapsulates the original location of the code (where the code
- * came from) and the public key(s) of its signer.
- *
- * @return the set of permissions according to the policy.
- */
- PermissionCollection getPermissions(CodeSource codesource) {
-
- if (initialized) {
- return getPermissions(new Permissions(), codesource);
- } else {
- return new PolicyPermissions(this, codesource);
- }
- }
-
- /**
- * Examines the global policy for the specified CodeSource, and
- * creates a PermissionCollection object with
- * the set of permissions for that principal's protection domain.
- *
- * @param permissions the permissions to populate
- * @param codesource the codesource associated with the caller.
- * This encapsulates the original location of the code (where the code
- * came from) and the public key(s) of its signer.
- *
- * @return the set of permissions according to the policy.
- */
- Permissions getPermissions(final Permissions perms,
- final CodeSource cs)
- {
- if (!initialized) {
- init();
- }
-
- final CodeSource[] codesource = {null};
-
- codesource[0] = canonicalizeCodebase(cs, true);
-
- if (debug != null) {
- debug.println("evaluate(" + codesource[0] + ")\n");
- }
-
- // needs to be in a begin/endPrivileged block because
- // codesource.implies calls URL.equals which does an
- // InetAddress lookup
-
- for (int i = 0; i < policyEntries.size(); i++) {
-
- PolicyEntry entry = policyEntries.elementAt(i);
-
- if (debug != null) {
- debug.println("PolicyFile CodeSource implies: " +
- entry.codesource.toString() + "\n\n" +
- "\t" + codesource[0].toString() + "\n\n");
- }
-
- if (entry.codesource.implies(codesource[0])) {
- for (int j = 0; j < entry.permissions.size(); j++) {
- Permission p = entry.permissions.elementAt(j);
- if (debug != null) {
- debug.println(" granting " + p);
- }
- if (!addSelfPermissions(p, entry.codesource,
- codesource[0], perms)) {
- // we could check for duplicates
- // before adding new permissions,
- // but the SubjectDomainCombiner
- // already checks for duplicates later
- perms.add(p);
- }
- }
- }
- }
-
- // now see if any of the keys are trusted ids.
-
- if (!ignoreIdentityScope) {
- Certificate[] certs = codesource[0].getCertificates();
- if (certs != null) {
- for (int k=0; k < certs.length; k++) {
- if (aliasMapping.get(certs[k]) == null &&
- checkForTrustedIdentity(certs[k])) {
- // checkForTrustedIdentity added it
- // to the policy for us. next time
- // around we'll find it. This time
- // around we need to add it.
- perms.add(new java.security.AllPermission());
- }
- }
- }
- }
- return perms;
- }
-
- /**
- * Returns true if 'Self' permissions were added to the provided
- * 'perms', and false otherwise.
- *
- *
- *
- * @param p check to see if this Permission is a "SELF"
- * PrivateCredentialPermission.
- *
- * @param entryCs the codesource for the Policy entry.
- *
- * @param accCs the codesource for from the current AccessControlContext.
- *
- * @param perms the PermissionCollection where the individual
- * PrivateCredentialPermissions will be added.
- */
- private boolean addSelfPermissions(final Permission p,
- CodeSource entryCs,
- CodeSource accCs,
- Permissions perms) {
-
- if (!(p instanceof PrivateCredentialPermission)) {
- return false;
- }
-
- if (!(entryCs instanceof SubjectCodeSource)) {
- return false;
- }
-
- PrivateCredentialPermission pcp = (PrivateCredentialPermission)p;
- SubjectCodeSource scs = (SubjectCodeSource)entryCs;
-
- // see if it is a SELF permission
- String[][] pPrincipals = pcp.getPrincipals();
- if (pPrincipals.length <= 0 ||
- !pPrincipals[0][0].equalsIgnoreCase("self") ||
- !pPrincipals[0][1].equalsIgnoreCase("self")) {
-
- // regular PrivateCredentialPermission
- return false;
- } else {
-
- // granted a SELF permission - create a
- // PrivateCredentialPermission for each
- // of the Policy entry's CodeSource Principals
-
- if (scs.getPrincipals() == null) {
- // XXX SubjectCodeSource has no Subject???
- return true;
- }
-
- for (PrincipalEntry principal : scs.getPrincipals()) {
-
- // if the Policy entry's Principal does not contain a
- // WILDCARD for the Principal name, then a
- // new PrivateCredentialPermission is created
- // for the Principal listed in the Policy entry.
- // if the Policy entry's Principal contains a WILDCARD
- // for the Principal name, then a new
- // PrivateCredentialPermission is created
- // for each Principal associated with the Subject
- // in the current ACC.
-
- String[][] principalInfo = getPrincipalInfo(principal, accCs);
-
- for (int i = 0; i < principalInfo.length; i++) {
-
- // here's the new PrivateCredentialPermission
-
- PrivateCredentialPermission newPcp =
- new PrivateCredentialPermission
- (pcp.getCredentialClass() +
- " " +
- principalInfo[i][0] +
- " " +
- "\"" + principalInfo[i][1] + "\"",
- "read");
-
- if (debug != null) {
- debug.println("adding SELF permission: " +
- newPcp.toString());
- }
-
- perms.add(newPcp);
- }
- }
- }
- return true;
- }
-
- /**
- * return the principal class/name pair in the 2D array.
- * array[x][y]: x corresponds to the array length.
- * if (y == 0), it's the principal class.
- * if (y == 1), it's the principal name.
- */
- private String[][] getPrincipalInfo(PrincipalEntry principal,
- final CodeSource accCs) {
-
- // there are 3 possibilities:
- // 1) the entry's Principal class and name are not wildcarded
- // 2) the entry's Principal name is wildcarded only
- // 3) the entry's Principal class and name are wildcarded
-
- if (!principal.getPrincipalClass().equals
- (PrincipalEntry.WILDCARD_CLASS) &&
- !principal.getPrincipalName().equals
- (PrincipalEntry.WILDCARD_NAME)) {
-
- // build a PrivateCredentialPermission for the principal
- // from the Policy entry
- String[][] info = new String[1][2];
- info[0][0] = principal.getPrincipalClass();
- info[0][1] = principal.getPrincipalName();
- return info;
-
- } else if (!principal.getPrincipalClass().equals
- (PrincipalEntry.WILDCARD_CLASS) &&
- principal.getPrincipalName().equals
- (PrincipalEntry.WILDCARD_NAME)) {
-
- // build a PrivateCredentialPermission for all
- // the Subject's principals that are instances of principalClass
-
- // the accCs is guaranteed to be a SubjectCodeSource
- // because the earlier CodeSource.implies succeeded
- SubjectCodeSource scs = (SubjectCodeSource)accCs;
-
- Set principalSet = null;
- try {
- // principal.principalClass should extend Principal
- // If it doesn't, we should stop here with a ClassCastException.
- @SuppressWarnings("unchecked")
- Class pClass = (Class)
- Class.forName(principal.getPrincipalClass(), false,
- ClassLoader.getSystemClassLoader());
- principalSet = scs.getSubject().getPrincipals(pClass);
- } catch (Exception e) {
- if (debug != null) {
- debug.println("problem finding Principal Class " +
- "when expanding SELF permission: " +
- e.toString());
- }
- }
-
- if (principalSet == null) {
- // error
- return new String[0][0];
- }
-
- String[][] info = new String[principalSet.size()][2];
-
- int i = 0;
- for (Principal p : principalSet) {
- info[i][0] = p.getClass().getName();
- info[i][1] = p.getName();
- i++;
- }
- return info;
-
- } else {
-
- // build a PrivateCredentialPermission for every
- // one of the current Subject's principals
-
- // the accCs is guaranteed to be a SubjectCodeSource
- // because the earlier CodeSource.implies succeeded
- SubjectCodeSource scs = (SubjectCodeSource)accCs;
- Set principalSet = scs.getSubject().getPrincipals();
-
- String[][] info = new String[principalSet.size()][2];
-
- int i = 0;
- for (Principal p : principalSet) {
- info[i][0] = p.getClass().getName();
- info[i][1] = p.getName();
- i++;
- }
- return info;
- }
- }
-
- /*
- * Returns the signer certificates from the list of certificates associated
- * with the given code source.
- *
- * The signer certificates are those certificates that were used to verify
- * signed code originating from the codesource location.
- *
- * This method assumes that in the given code source, each signer
- * certificate is followed by its supporting certificate chain
- * (which may be empty), and that the signer certificate and its
- * supporting certificate chain are ordered bottom-to-top (i.e., with the
- * signer certificate first and the (root) certificate authority last).
- */
- Certificate[] getSignerCertificates(CodeSource cs) {
- Certificate[] certs = null;
- if ((certs = cs.getCertificates()) == null) {
- return null;
- }
- for (int i = 0; i < certs.length; i++) {
- if (!(certs[i] instanceof X509Certificate))
- return cs.getCertificates();
- }
-
- // Do we have to do anything?
- int i = 0;
- int count = 0;
- while (i < certs.length) {
- count++;
- while (((i+1) < certs.length)
- && ((X509Certificate)certs[i]).getIssuerDN().equals(
- ((X509Certificate)certs[i+1]).getSubjectDN())) {
- i++;
- }
- i++;
- }
- if (count == certs.length) {
- // Done
- return certs;
- }
-
- ArrayList userCertList = new ArrayList<>();
- i = 0;
- while (i < certs.length) {
- userCertList.add(certs[i]);
- while (((i+1) < certs.length)
- && ((X509Certificate)certs[i]).getIssuerDN().equals(
- ((X509Certificate)certs[i+1]).getSubjectDN())) {
- i++;
- }
- i++;
- }
- Certificate[] userCerts = new Certificate[userCertList.size()];
- userCertList.toArray(userCerts);
- return userCerts;
- }
-
- private CodeSource canonicalizeCodebase(CodeSource cs,
- boolean extractSignerCerts) {
- CodeSource canonCs = cs;
- if (cs.getLocation() != null &&
- cs.getLocation().getProtocol().equalsIgnoreCase("file")) {
- try {
- String path = cs.getLocation().getFile().replace
- ('/',
- File.separatorChar);
- URL csUrl = null;
- if (path.endsWith("*")) {
- // remove trailing '*' because it causes canonicalization
- // to fail on win32
- path = path.substring(0, path.length()-1);
- boolean appendFileSep = false;
- if (path.endsWith(File.separator)) {
- appendFileSep = true;
- }
- if (path.equals("")) {
- path = System.getProperty("user.dir");
- }
- File f = new File(path);
- path = f.getCanonicalPath();
- StringBuilder sb = new StringBuilder(path);
- // reappend '*' to canonicalized filename (note that
- // canonicalization may have removed trailing file
- // separator, so we have to check for that, too)
- if (!path.endsWith(File.separator) &&
- (appendFileSep || f.isDirectory())) {
- sb.append(File.separatorChar);
- }
- sb.append('*');
- path = sb.toString();
- } else {
- path = new File(path).getCanonicalPath();
- }
- csUrl = new File(path).toURL();
-
- if (cs instanceof SubjectCodeSource) {
- SubjectCodeSource scs = (SubjectCodeSource)cs;
- if (extractSignerCerts) {
- canonCs = new SubjectCodeSource(scs.getSubject(),
- scs.getPrincipals(),
- csUrl,
- getSignerCertificates(scs));
- } else {
- canonCs = new SubjectCodeSource(scs.getSubject(),
- scs.getPrincipals(),
- csUrl,
- scs.getCertificates());
- }
- } else {
- if (extractSignerCerts) {
- canonCs = new CodeSource(csUrl,
- getSignerCertificates(cs));
- } else {
- canonCs = new CodeSource(csUrl,
- cs.getCertificates());
- }
- }
- } catch (IOException ioe) {
- // leave codesource as it is, unless we have to extract its
- // signer certificates
- if (extractSignerCerts) {
- if (!(cs instanceof SubjectCodeSource)) {
- canonCs = new CodeSource(cs.getLocation(),
- getSignerCertificates(cs));
- } else {
- SubjectCodeSource scs = (SubjectCodeSource)cs;
- canonCs = new SubjectCodeSource(scs.getSubject(),
- scs.getPrincipals(),
- scs.getLocation(),
- getSignerCertificates(scs));
- }
- }
- }
- } else {
- if (extractSignerCerts) {
- if (!(cs instanceof SubjectCodeSource)) {
- canonCs = new CodeSource(cs.getLocation(),
- getSignerCertificates(cs));
- } else {
- SubjectCodeSource scs = (SubjectCodeSource)cs;
- canonCs = new SubjectCodeSource(scs.getSubject(),
- scs.getPrincipals(),
- scs.getLocation(),
- getSignerCertificates(scs));
- }
- }
- }
- return canonCs;
- }
-
- /**
- * Each entry in the policy configuration file is represented by a
- * PolicyEntry object.
- *
- * A PolicyEntry is a (CodeSource,Permission) pair. The
- * CodeSource contains the (URL, PublicKey) that together identify
- * where the Java bytecodes come from and who (if anyone) signed
- * them. The URL could refer to localhost. The URL could also be
- * null, meaning that this policy entry is given to all comers, as
- * long as they match the signer field. The signer could be null,
- * meaning the code is not signed.
- *
- * The Permission contains the (Type, Name, Action) triplet.
- *
- * For now, the Policy object retrieves the public key from the
- * X.509 certificate on disk that corresponds to the signedBy
- * alias specified in the Policy config file. For reasons of
- * efficiency, the Policy object keeps a hashtable of certs already
- * read in. This could be replaced by a secure internal key
- * store.
- *
- *
- * For example, the entry
- *
- * permission java.io.File "/tmp", "read,write",
- * signedBy "Duke";
- *
- * is represented internally
- *
- *
- * FilePermission f = new FilePermission("/tmp", "read,write");
- * PublicKey p = publickeys.get("Duke");
- * URL u = InetAddress.getLocalHost();
- * CodeBase c = new CodeBase( p, u );
- * pe = new PolicyEntry(f, c);
- *
- *
- * @author Marianne Mueller
- * @author Roland Schemers
- * @see java.security.CodeSource
- * @see java.security.Policy
- * @see java.security.Permissions
- * @see java.security.ProtectionDomain
- */
- private static class PolicyEntry {
-
- CodeSource codesource;
- Vector permissions;
-
- /**
- * Given a Permission and a CodeSource, create a policy entry.
- *
- * XXX Decide if/how to add validity fields and "purpose" fields to
- * XXX policy entries
- *
- * @param cs the CodeSource, which encapsulates the URL and the public
- * key attributes from the policy config file. Validity checks
- * are performed on the public key before PolicyEntry is called.
- *
- */
- PolicyEntry(CodeSource cs) {
- this.codesource = cs;
- this.permissions = new Vector();
- }
-
- /**
- * add a Permission object to this entry.
- */
- void add(Permission p) {
- permissions.addElement(p);
- }
-
- /**
- * Return the CodeSource for this policy entry
- */
- CodeSource getCodeSource() {
- return this.codesource;
- }
-
- @Override
- public String toString(){
- StringBuilder sb = new StringBuilder();
- sb.append(rb.getString("LPARAM"));
- sb.append(getCodeSource());
- sb.append("\n");
- for (int j = 0; j < permissions.size(); j++) {
- Permission p = permissions.elementAt(j);
- sb.append(rb.getString("SPACE"));
- sb.append(rb.getString("SPACE"));
- sb.append(p);
- sb.append(rb.getString("NEWLINE"));
- }
- sb.append(rb.getString("RPARAM"));
- sb.append(rb.getString("NEWLINE"));
- return sb.toString();
- }
-
- }
-}
-
-@SuppressWarnings("deprecation")
-class PolicyPermissions extends PermissionCollection {
-
- private static final long serialVersionUID = -1954188373270545523L;
-
- private CodeSource codesource;
- private Permissions perms;
- private AuthPolicyFile policy;
- private boolean notInit; // have we pulled in the policy permissions yet?
- private Vector additionalPerms;
-
- PolicyPermissions(AuthPolicyFile policy,
- CodeSource codesource)
- {
- this.codesource = codesource;
- this.policy = policy;
- this.perms = null;
- this.notInit = true;
- this.additionalPerms = null;
- }
-
- @Override
- public void add(Permission permission) {
- if (isReadOnly())
- throw new SecurityException
- (AuthPolicyFile.rb.getString
- ("attempt.to.add.a.Permission.to.a.readonly.PermissionCollection"));
-
- if (perms == null) {
- if (additionalPerms == null) {
- additionalPerms = new Vector();
- }
- additionalPerms.add(permission);
- } else {
- perms.add(permission);
- }
- }
-
- private synchronized void init() {
- if (notInit) {
- if (perms == null) {
- perms = new Permissions();
- }
- if (additionalPerms != null) {
- Enumeration e = additionalPerms.elements();
- while (e.hasMoreElements()) {
- perms.add(e.nextElement());
- }
- additionalPerms = null;
- }
- policy.getPermissions(perms, codesource);
- notInit = false;
- }
- }
-
- @Override
- public boolean implies(Permission permission) {
- if (notInit) {
- init();
- }
- return perms.implies(permission);
- }
-
- @Override
- public Enumeration elements() {
- if (notInit) {
- init();
- }
- return perms.elements();
- }
-
- @Override
- public String toString() {
- if (notInit) {
- init();
- }
- return perms.toString();
- }
-}
diff --git a/src/java.base/share/classes/sun/security/provider/PolicyFile.java b/src/java.base/share/classes/sun/security/provider/PolicyFile.java
index fb7e7cceafc..6aadd9c2361 100644
--- a/src/java.base/share/classes/sun/security/provider/PolicyFile.java
+++ b/src/java.base/share/classes/sun/security/provider/PolicyFile.java
@@ -30,7 +30,7 @@ import java.lang.reflect.*;
import java.net.MalformedURLException;
import java.net.URL;
import java.net.URI;
-import java.nio.file.Paths;
+import java.nio.file.Path;
import java.util.*;
import java.security.*;
import java.security.cert.Certificate;
@@ -51,13 +51,6 @@ import sun.net.www.ParseUtil;
* This class represents a default Policy implementation for the
* "JavaPolicy" type.
*
- * Note:
- * For backward compatibility with JAAS 1.0 it loads
- * both java.auth.policy and java.policy. However, it
- * is recommended that java.auth.policy not be used
- * and that java.policy contain all grant entries including
- * those that contain principal-based entries.
- *
* This object stores the policy for the entire Java runtime,
* and is the amalgamation of multiple static policy
* configurations that resides in files.
@@ -75,17 +68,13 @@ import sun.net.www.ParseUtil;
* are needed in order for the runtime to operate correctly.
*
* Loop through the java.security.Security properties,
- * policy.url.1, policy.url.2, ...,
- * policy.url.X" and
- * auth.policy.url.1, auth.policy.url.2, ...,
- * auth.policy.url.X". These properties are set
+ * and policy.url.1, policy.url.2, ...,
+ * policy.url.X". These properties are set
* in the Java security properties file, which is located in the file named
* <JAVA_HOME>/conf/security/java.security.
* Each property value specifies a URL pointing to a
* policy file to be loaded. Read in and load each policy.
*
- * auth.policy.url is supported only for backward compatibility.
- *
* If none of these could be loaded, use a builtin static policy
* equivalent to the conf/security/java.policy file.
*
@@ -98,21 +87,7 @@ import sun.net.www.ParseUtil;
* policy.allowSystemProperty is set to true),
* also load that policy.
*
- *
- * The java.lang.System property
- * java.security.auth.policy may also be set to a
- * URL pointing to another policy file
- * (which is the case when a user uses the -D switch at runtime).
- * If this property is defined, and its use is allowed by the
- * security property file (the Security property,
- * policy.allowSystemProperty is set to true),
- * also load that policy.
- *
- * java.security.auth.policy is supported only for backward
- * compatibility.
- *
- * If the java.security.policy or
- * java.security.auth.policy property is defined using
+ * If the java.security.policy property is defined using
* "==" (rather than "="), then load the specified policy file and ignore
* all other configured policies. Note, that the default.policy file is
* also loaded, as specified in the first step of the algorithm above.
@@ -269,8 +244,6 @@ public class PolicyFile extends java.security.Policy {
"javax.security.auth.x500.X500Principal";
private static final String POLICY = "java.security.policy";
private static final String POLICY_URL = "policy.url.";
- private static final String AUTH_POLICY = "java.security.auth.policy";
- private static final String AUTH_POLICY_URL = "auth.policy.url.";
private static final int DEFAULT_CACHE_SIZE = 1;
@@ -305,7 +278,7 @@ public class PolicyFile extends java.security.Policy {
public URL run() {
String sep = File.separator;
try {
- return Paths.get(System.getProperty("java.home"),
+ return Path.of(System.getProperty("java.home"),
"lib", "security",
"default.policy").toUri().toURL();
} catch (MalformedURLException mue) {
@@ -411,14 +384,6 @@ public class PolicyFile extends java.security.Policy {
/**
* Caller did not specify URL via Policy.getInstance.
* Read from URLs listed in the java.security properties file.
- *
- * We call initPolicyFile with POLICY, POLICY_URL and then
- * call it with AUTH_POLICY and AUTH_POLICY_URL.
- * So first we will process the JAVA standard policy
- * and then process the JAVA AUTH Policy.
- * This is for backward compatibility as well as to handle
- * cases where the user has a single unified policyfile
- * with both java policy entries and auth entries
*/
boolean loaded_one = initPolicyFile(POLICY, POLICY_URL, newInfo);
@@ -428,8 +393,6 @@ public class PolicyFile extends java.security.Policy {
// use static policy if all else fails
initStaticPolicy(newInfo);
}
-
- initPolicyFile(AUTH_POLICY, AUTH_POLICY_URL, newInfo);
}
}
diff --git a/src/java.base/share/classes/sun/security/tools/keytool/Main.java b/src/java.base/share/classes/sun/security/tools/keytool/Main.java
index 4413458d408..9696c6d7c67 100644
--- a/src/java.base/share/classes/sun/security/tools/keytool/Main.java
+++ b/src/java.base/share/classes/sun/security/tools/keytool/Main.java
@@ -27,7 +27,7 @@ package sun.security.tools.keytool;
import java.io.*;
import java.nio.file.Files;
-import java.nio.file.Paths;
+import java.nio.file.Path;
import java.security.CodeSigner;
import java.security.CryptoPrimitive;
import java.security.KeyStore;
@@ -2189,7 +2189,7 @@ public final class Main {
inplaceBackupName = srcksfname + ".old" + (n == 1 ? "" : n);
File bkFile = new File(inplaceBackupName);
if (!bkFile.exists()) {
- Files.copy(Paths.get(srcksfname), bkFile.toPath());
+ Files.copy(Path.of(srcksfname), bkFile.toPath());
break;
}
}
diff --git a/src/java.base/share/classes/sun/security/util/Resources.java b/src/java.base/share/classes/sun/security/util/Resources.java
index 59d82de40da..d1b0cae55e5 100644
--- a/src/java.base/share/classes/sun/security/util/Resources.java
+++ b/src/java.base/share/classes/sun/security/util/Resources.java
@@ -150,11 +150,6 @@ public class Resources extends java.util.ListResourceBundle {
// sun.security.pkcs11.SunPKCS11
{"PKCS11.Token.providerName.Password.",
"PKCS11 Token [{0}] Password: "},
-
- /* --- DEPRECATED --- */
- // javax.security.auth.Policy
- {"unable.to.instantiate.Subject.based.policy",
- "unable to instantiate Subject-based policy"}
};
diff --git a/src/java.base/share/native/libjava/System.c b/src/java.base/share/native/libjava/System.c
index 0b5aa561c4e..3a33f11797f 100644
--- a/src/java.base/share/native/libjava/System.c
+++ b/src/java.base/share/native/libjava/System.c
@@ -244,30 +244,14 @@ Java_java_lang_System_initProperties(JNIEnv *env, jclass cla, jobject props)
PUTPROP(props, "line.separator", sprops->line_separator);
/*
- * user.language
- * user.script, user.country, user.variant (if user's environment specifies them)
- * file.encoding
- * file.encoding.pkg
+ * file encoding for stdout and stderr
*/
- PUTPROP(props, "user.language", sprops->language);
- if (sprops->script) {
- PUTPROP(props, "user.script", sprops->script);
- }
- if (sprops->country) {
- PUTPROP(props, "user.country", sprops->country);
- }
- if (sprops->variant) {
- PUTPROP(props, "user.variant", sprops->variant);
- }
- PUTPROP(props, "file.encoding", sprops->encoding);
- PUTPROP(props, "sun.jnu.encoding", sprops->sun_jnu_encoding);
if (sprops->sun_stdout_encoding != NULL) {
PUTPROP(props, "sun.stdout.encoding", sprops->sun_stdout_encoding);
}
if (sprops->sun_stderr_encoding != NULL) {
PUTPROP(props, "sun.stderr.encoding", sprops->sun_stderr_encoding);
}
- PUTPROP(props, "file.encoding.pkg", "sun.io");
/* unicode_encoding specifies the default endianness */
PUTPROP(props, "sun.io.unicode.encoding", sprops->unicode_encoding);
@@ -317,8 +301,9 @@ Java_java_lang_System_initProperties(JNIEnv *env, jclass cla, jobject props)
#endif
/* !!! DO NOT call PUTPROP_ForPlatformNString before this line !!!
- * !!! I18n properties have not been set up yet !!!
+ * !!! The platform native encoding for strings has not been set up yet !!!
*/
+ InitializeEncoding(env, sprops->sun_jnu_encoding);
/* Printing properties */
/* Note: java.awt.printerjob is an implementation private property which
@@ -381,17 +366,6 @@ Java_java_lang_System_initProperties(JNIEnv *env, jclass cla, jobject props)
PUTPROP(props, "sun.desktop", sprops->desktop);
}
- /*
- * unset "user.language", "user.script", "user.country", and "user.variant"
- * in order to tell whether the command line option "-DXXXX=YYYY" is
- * specified or not. They will be reset in fillI18nProps() below.
- */
- REMOVEPROP(props, "user.language");
- REMOVEPROP(props, "user.script");
- REMOVEPROP(props, "user.country");
- REMOVEPROP(props, "user.variant");
- REMOVEPROP(props, "file.encoding");
-
ret = JVM_InitProperties(env, props);
/* reconstruct i18n related properties */
@@ -418,6 +392,9 @@ Java_java_lang_System_initProperties(JNIEnv *env, jclass cla, jobject props)
(*env)->DeleteLocalRef(env, jVMVal);
}
+ // Platform defined encoding properties override any on the command line
+ PUTPROP(props, "sun.jnu.encoding", sprops->sun_jnu_encoding);
+
return ret;
}
diff --git a/src/java.base/share/native/libjava/jni_util.c b/src/java.base/share/native/libjava/jni_util.c
index 500431bbcec..e42a1c32b38 100644
--- a/src/java.base/share/native/libjava/jni_util.c
+++ b/src/java.base/share/native/libjava/jni_util.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, 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
@@ -774,14 +774,10 @@ newStringUTF8(JNIEnv *env, const char *str)
return newSizedStringJava(env, str, len);
}
-/* Initialize the fast encoding. If the "sun.jnu.encoding" property
- * has not yet been set, we leave fastEncoding == NO_ENCODING_YET.
- */
+/* Initialize the fast encoding from the encoding name. */
void
-initializeEncoding(JNIEnv *env)
+InitializeEncoding(JNIEnv *env, const char *encname)
{
- jstring propname = 0;
- jstring enc = 0;
jclass strClazz = NULL;
if ((*env)->EnsureLocalCapacity(env, 3) < 0)
@@ -790,61 +786,49 @@ initializeEncoding(JNIEnv *env)
strClazz = JNU_ClassString(env);
CHECK_NULL(strClazz);
- propname = (*env)->NewStringUTF(env, "sun.jnu.encoding");
- if (propname) {
- jboolean exc;
- enc = JNU_CallStaticMethodByName
- (env,
- &exc,
- "java/lang/System",
- "getProperty",
- "(Ljava/lang/String;)Ljava/lang/String;",
- propname).l;
- if (!exc) {
- if (enc) {
- const char* encname = (*env)->GetStringUTFChars(env, enc, 0);
- if (encname) {
- /*
- * On Solaris with nl_langinfo() called in GetJavaProperties():
- *
- * locale undefined -> NULL -> hardcoded default
- * "C" locale -> "" -> hardcoded default (on 2.6)
- * "C" locale -> "ISO646-US" (on Sol 7/8)
- * "en_US" locale -> "ISO8859-1"
- * "en_GB" locale -> "ISO8859-1" (on Sol 7/8)
- * "en_UK" locale -> "ISO8859-1" (on 2.6)
- */
- if ((strcmp(encname, "8859_1") == 0) ||
- (strcmp(encname, "ISO8859-1") == 0) ||
- (strcmp(encname, "ISO8859_1") == 0) ||
- (strcmp(encname, "ISO-8859-1") == 0)) {
- fastEncoding = FAST_8859_1;
- } else if (strcmp(encname, "UTF-8") == 0) {
- fastEncoding = FAST_UTF_8;
- jnuEncoding = (jstring)(*env)->NewGlobalRef(env, enc);
- } else if (strcmp(encname, "ISO646-US") == 0) {
- fastEncoding = FAST_646_US;
- } else if (strcmp(encname, "Cp1252") == 0 ||
- /* This is a temporary fix until we move */
- /* to wide character versions of all Windows */
- /* calls. */
- strcmp(encname, "utf-16le") == 0) {
- fastEncoding = FAST_CP1252;
- } else {
- fastEncoding = NO_FAST_ENCODING;
- jnuEncoding = (jstring)(*env)->NewGlobalRef(env, enc);
- }
- (*env)->ReleaseStringUTFChars(env, enc, encname);
- }
- }
+ if (encname) {
+ /*
+ * On Solaris with nl_langinfo() called in GetJavaProperties():
+ *
+ * locale undefined -> NULL -> hardcoded default
+ * "C" locale -> "" -> hardcoded default (on 2.6)
+ * "C" locale -> "ISO646-US" (on Sol 7/8)
+ * "en_US" locale -> "ISO8859-1"
+ * "en_GB" locale -> "ISO8859-1" (on Sol 7/8)
+ * "en_UK" locale -> "ISO8859-1" (on 2.6)
+ */
+ if ((strcmp(encname, "8859_1") == 0) ||
+ (strcmp(encname, "ISO8859-1") == 0) ||
+ (strcmp(encname, "ISO8859_1") == 0) ||
+ (strcmp(encname, "ISO-8859-1") == 0)) {
+ fastEncoding = FAST_8859_1;
+ } else if (strcmp(encname, "UTF-8") == 0) {
+ jstring enc = (*env)->NewStringUTF(env, encname);
+ if (enc == NULL)
+ return;
+ fastEncoding = FAST_UTF_8;
+ jnuEncoding = (jstring)(*env)->NewGlobalRef(env, enc);
+ (*env)->DeleteLocalRef(env, enc);
+ } else if (strcmp(encname, "ISO646-US") == 0) {
+ fastEncoding = FAST_646_US;
+ } else if (strcmp(encname, "Cp1252") == 0 ||
+ /* This is a temporary fix until we move */
+ /* to wide character versions of all Windows */
+ /* calls. */
+ strcmp(encname, "utf-16le") == 0) {
+ fastEncoding = FAST_CP1252;
} else {
- (*env)->ExceptionClear(env);
+ jstring enc = (*env)->NewStringUTF(env, encname);
+ if (enc == NULL)
+ return;
+ fastEncoding = NO_FAST_ENCODING;
+ jnuEncoding = (jstring)(*env)->NewGlobalRef(env, enc);
+ (*env)->DeleteLocalRef(env, enc);
}
} else {
- (*env)->ExceptionClear(env);
+ JNU_ThrowInternalError(env, "platform encoding undefined");
+ return;
}
- (*env)->DeleteLocalRef(env, propname);
- (*env)->DeleteLocalRef(env, enc);
/* Initialize method-id cache */
String_getBytes_ID = (*env)->GetMethodID(env, strClazz,
@@ -865,19 +849,18 @@ NewStringPlatform(JNIEnv *env, const char *str)
JNIEXPORT jstring JNICALL
JNU_NewStringPlatform(JNIEnv *env, const char *str)
{
- if (fastEncoding == NO_ENCODING_YET) {
- initializeEncoding(env);
- JNU_CHECK_EXCEPTION_RETURN(env, NULL);
- }
-
- if ((fastEncoding == FAST_8859_1) || (fastEncoding == NO_ENCODING_YET))
+ if (fastEncoding == FAST_UTF_8)
+ return newStringUTF8(env, str);
+ if (fastEncoding == FAST_8859_1)
return newString8859_1(env, str);
if (fastEncoding == FAST_646_US)
return newString646_US(env, str);
if (fastEncoding == FAST_CP1252)
return newStringCp1252(env, str);
- if (fastEncoding == FAST_UTF_8)
- return newStringUTF8(env, str);
+ if (fastEncoding == NO_ENCODING_YET) {
+ JNU_ThrowInternalError(env, "platform encoding not initialized");
+ return NULL;
+ }
return newStringJava(env, str);
}
@@ -985,20 +968,18 @@ JNU_GetStringPlatformChars(JNIEnv *env, jstring jstr, jboolean *isCopy)
if (isCopy)
*isCopy = JNI_TRUE;
- if (fastEncoding == NO_ENCODING_YET) {
- initializeEncoding(env);
- JNU_CHECK_EXCEPTION_RETURN(env, 0);
- }
-
- if ((fastEncoding == FAST_8859_1) || (fastEncoding == NO_ENCODING_YET))
+ if (fastEncoding == FAST_UTF_8)
+ return getStringUTF8(env, jstr);
+ if (fastEncoding == FAST_8859_1)
return getString8859_1Chars(env, jstr);
if (fastEncoding == FAST_646_US)
return getString646_USChars(env, jstr);
if (fastEncoding == FAST_CP1252)
return getStringCp1252Chars(env, jstr);
- if (fastEncoding == FAST_UTF_8)
- return getStringUTF8(env, jstr);
- else
+ if (fastEncoding == NO_ENCODING_YET) {
+ JNU_ThrowInternalError(env, "platform encoding not initialized");
+ return 0;
+ } else
return getStringBytes(env, jstr);
}
diff --git a/src/java.base/share/native/libjava/jni_util.h b/src/java.base/share/native/libjava/jni_util.h
index b1f9b1d6b97..34ddf43efe5 100644
--- a/src/java.base/share/native/libjava/jni_util.h
+++ b/src/java.base/share/native/libjava/jni_util.h
@@ -388,7 +388,7 @@ enum {
int getFastEncoding();
-void initializeEncoding();
+void InitializeEncoding(JNIEnv *env, const char *name);
void* getProcessHandle();
diff --git a/src/java.base/solaris/classes/sun/nio/ch/DevPollArrayWrapper.java b/src/java.base/solaris/classes/sun/nio/ch/DevPollArrayWrapper.java
index 17c57ade8f0..eb657de13df 100644
--- a/src/java.base/solaris/classes/sun/nio/ch/DevPollArrayWrapper.java
+++ b/src/java.base/solaris/classes/sun/nio/ch/DevPollArrayWrapper.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2018, 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
@@ -127,7 +127,7 @@ class DevPollArrayWrapper {
// descriptor is registered with /dev/poll.
private final BitSet registered = new BitSet();
- DevPollArrayWrapper() {
+ DevPollArrayWrapper() throws IOException {
int allocationSize = NUM_POLLFDS * SIZE_POLLFD;
pollArray = new AllocatedNativeObject(allocationSize, true);
pollArrayAddress = pollArray.address();
@@ -136,7 +136,7 @@ class DevPollArrayWrapper {
eventsHigh = new HashMap<>();
}
- void initInterrupt(int fd0, int fd1) {
+ void initInterrupt(int fd0, int fd1) throws IOException {
outgoingInterruptFD = fd1;
incomingInterruptFD = fd0;
register(wfd, fd0, POLLIN);
@@ -200,7 +200,7 @@ class DevPollArrayWrapper {
}
}
- void release(int fd) {
+ void release(int fd) throws IOException {
synchronized (updateLock) {
// ignore any pending update for this file descriptor
setUpdateEvents(fd, IGNORE);
@@ -213,7 +213,7 @@ class DevPollArrayWrapper {
}
}
- void closeDevPollFD() throws IOException {
+ void close() throws IOException {
FileDispatcherImpl.closeIntFD(wfd);
pollArray.free();
}
@@ -297,7 +297,11 @@ class DevPollArrayWrapper {
boolean interrupted = false;
public void interrupt() {
- interrupt(outgoingInterruptFD);
+ try {
+ IOUtil.write1(outgoingInterruptFD, (byte)0);
+ } catch (IOException ioe) {
+ throw new InternalError(ioe);
+ }
}
public int interruptedIndex() {
@@ -312,13 +316,12 @@ class DevPollArrayWrapper {
interrupted = false;
}
- private native int init();
- private native void register(int wfd, int fd, int mask);
+ private native int init() throws IOException;
+ private native void register(int wfd, int fd, int mask) throws IOException;
private native void registerMultiple(int wfd, long address, int len)
throws IOException;
- private native int poll0(long pollAddress, int numfds, long timeout,
- int wfd);
- private static native void interrupt(int fd);
+ private native int poll0(long pollAddress, int numfds, long timeout, int wfd)
+ throws IOException;
static {
IOUtil.load();
diff --git a/src/java.base/solaris/classes/sun/nio/ch/DevPollSelectorImpl.java b/src/java.base/solaris/classes/sun/nio/ch/DevPollSelectorImpl.java
index 06c5e656512..8df7f28ba70 100644
--- a/src/java.base/solaris/classes/sun/nio/ch/DevPollSelectorImpl.java
+++ b/src/java.base/solaris/classes/sun/nio/ch/DevPollSelectorImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2018, 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
@@ -37,32 +37,31 @@ import java.util.*;
class DevPollSelectorImpl
extends SelectorImpl
{
-
// File descriptors used for interrupt
- protected int fd0;
- protected int fd1;
+ private final int fd0;
+ private final int fd1;
// The poll object
- DevPollArrayWrapper pollWrapper;
+ private final DevPollArrayWrapper pollWrapper;
// Maps from file descriptors to keys
- private Map fdToKey;
+ private final Map fdToKey;
// True if this Selector has been closed
- private boolean closed = false;
+ private boolean closed;
// Lock for close/cleanup
- private Object closeLock = new Object();
+ private final Object closeLock = new Object();
// Lock for interrupt triggering and clearing
- private Object interruptLock = new Object();
- private boolean interruptTriggered = false;
+ private final Object interruptLock = new Object();
+ private boolean interruptTriggered;
/**
* Package private constructor called by factory method in
* the abstract superclass Selector.
*/
- DevPollSelectorImpl(SelectorProvider sp) {
+ DevPollSelectorImpl(SelectorProvider sp) throws IOException {
super(sp);
long pipeFds = IOUtil.makePipe(false);
fd0 = (int) (pipeFds >>> 32);
@@ -86,11 +85,16 @@ class DevPollSelectorImpl
}
}
+ private void ensureOpen() {
+ if (closed)
+ throw new ClosedSelectorException();
+ }
+
+ @Override
protected int doSelect(long timeout)
throws IOException
{
- if (closed)
- throw new ClosedSelectorException();
+ ensureOpen();
processDeregisterQueue();
try {
begin();
@@ -141,6 +145,7 @@ class DevPollSelectorImpl
return numKeysUpdated;
}
+ @Override
protected void implClose() throws IOException {
if (closed)
return;
@@ -151,13 +156,10 @@ class DevPollSelectorImpl
interruptTriggered = true;
}
+ pollWrapper.close();
FileDispatcherImpl.closeIntFD(fd0);
FileDispatcherImpl.closeIntFD(fd1);
- pollWrapper.release(fd0);
- pollWrapper.closeDevPollFD();
- selectedKeys = null;
-
// Deregister channels
Iterator i = keys.iterator();
while (i.hasNext()) {
@@ -168,16 +170,16 @@ class DevPollSelectorImpl
((SelChImpl)selch).kill();
i.remove();
}
- fd0 = -1;
- fd1 = -1;
}
+ @Override
protected void implRegister(SelectionKeyImpl ski) {
int fd = IOUtil.fdVal(ski.channel.getFD());
fdToKey.put(Integer.valueOf(fd), ski);
keys.add(ski);
}
+ @Override
protected void implDereg(SelectionKeyImpl ski) throws IOException {
int i = ski.getIndex();
assert (i >= 0);
@@ -193,13 +195,14 @@ class DevPollSelectorImpl
((SelChImpl)selch).kill();
}
+ @Override
public void putEventOps(SelectionKeyImpl sk, int ops) {
- if (closed)
- throw new ClosedSelectorException();
+ ensureOpen();
int fd = IOUtil.fdVal(sk.channel.getFD());
pollWrapper.setInterest(fd, ops);
}
+ @Override
public Selector wakeup() {
synchronized (interruptLock) {
if (!interruptTriggered) {
diff --git a/src/java.base/solaris/classes/sun/nio/ch/EventPortSelectorImpl.java b/src/java.base/solaris/classes/sun/nio/ch/EventPortSelectorImpl.java
index 2b89dadff4f..8c88b0b8ee6 100644
--- a/src/java.base/solaris/classes/sun/nio/ch/EventPortSelectorImpl.java
+++ b/src/java.base/solaris/classes/sun/nio/ch/EventPortSelectorImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2018, 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
@@ -42,14 +42,14 @@ class EventPortSelectorImpl
private final EventPortWrapper pollWrapper;
// Maps from file descriptors to keys
- private Map fdToKey;
+ private final Map fdToKey;
// True if this Selector has been closed
- private boolean closed = false;
+ private boolean closed;
// Lock for interrupt triggering and clearing
private final Object interruptLock = new Object();
- private boolean interruptTriggered = false;
+ private boolean interruptTriggered;
/**
* Package private constructor called by factory method in
@@ -61,9 +61,14 @@ class EventPortSelectorImpl
fdToKey = new HashMap<>();
}
- protected int doSelect(long timeout) throws IOException {
+ private void ensureOpen() {
if (closed)
throw new ClosedSelectorException();
+ }
+
+ @Override
+ protected int doSelect(long timeout) throws IOException {
+ ensureOpen();
processDeregisterQueue();
int entries;
try {
@@ -105,6 +110,7 @@ class EventPortSelectorImpl
return numKeysUpdated;
}
+ @Override
protected void implClose() throws IOException {
if (closed)
return;
@@ -116,7 +122,6 @@ class EventPortSelectorImpl
}
pollWrapper.close();
- selectedKeys = null;
// Deregister channels
Iterator i = keys.iterator();
@@ -130,12 +135,14 @@ class EventPortSelectorImpl
}
}
+ @Override
protected void implRegister(SelectionKeyImpl ski) {
int fd = IOUtil.fdVal(ski.channel.getFD());
fdToKey.put(Integer.valueOf(fd), ski);
keys.add(ski);
}
+ @Override
protected void implDereg(SelectionKeyImpl ski) throws IOException {
int i = ski.getIndex();
assert (i >= 0);
@@ -151,13 +158,14 @@ class EventPortSelectorImpl
((SelChImpl)selch).kill();
}
+ @Override
public void putEventOps(SelectionKeyImpl sk, int ops) {
- if (closed)
- throw new ClosedSelectorException();
+ ensureOpen();
int fd = sk.channel.getFDVal();
pollWrapper.setInterest(fd, ops);
}
+ @Override
public Selector wakeup() {
synchronized (interruptLock) {
if (!interruptTriggered) {
diff --git a/src/java.base/solaris/classes/sun/nio/ch/EventPortWrapper.java b/src/java.base/solaris/classes/sun/nio/ch/EventPortWrapper.java
index 30a454c070f..b15e3e8ab3b 100644
--- a/src/java.base/solaris/classes/sun/nio/ch/EventPortWrapper.java
+++ b/src/java.base/solaris/classes/sun/nio/ch/EventPortWrapper.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2018, 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
@@ -181,12 +181,26 @@ class EventPortWrapper {
}
// poll for events
- int updated = port_getn(pfd, pollArrayAddress, POLL_MAX, timeout);
+ int numEntries;
+ long to = timeout;
+ boolean timedPoll = (to > 0);
+ do {
+ long startTime = timedPoll ? System.currentTimeMillis() : 0;
+ numEntries = port_getn(pfd, pollArrayAddress, POLL_MAX, timeout);
+ if (numEntries == IOStatus.INTERRUPTED && timedPoll) {
+ // timed poll interrupted so need to adjust timeout
+ to -= System.currentTimeMillis() - startTime;
+ if (to <= 0) {
+ // timeout also expired so no retry
+ numEntries = 0;
+ }
+ }
+ } while (numEntries == IOStatus.INTERRUPTED);
// after polling we need to queue all polled file descriptors as they
// are candidates to register for the next poll.
synchronized (updateLock) {
- for (int i=0; i
#include
#include
#include
+#include "jni.h"
+#include "jni_util.h"
+#include "jvm.h"
+#include "jlong.h"
+#include "nio.h"
+#include "nio_util.h"
+
#include "sun_nio_ch_SolarisEventPort.h"
JNIEXPORT jint JNICALL
@@ -51,8 +52,10 @@ JNIEXPORT void JNICALL
Java_sun_nio_ch_SolarisEventPort_port_1close
(JNIEnv* env, jclass clazz, jint port)
{
- int res;
- RESTARTABLE(close(port), res);
+ int res = close(port);
+ if (res < 0 && res != EINTR) {
+ JNU_ThrowIOExceptionWithLastError(env, "close failed");
+ }
}
JNIEXPORT jboolean JNICALL
@@ -93,17 +96,23 @@ Java_sun_nio_ch_SolarisEventPort_port_1send(JNIEnv* env, jclass clazz,
}
}
-JNIEXPORT void JNICALL
+JNIEXPORT jint JNICALL
Java_sun_nio_ch_SolarisEventPort_port_1get(JNIEnv* env, jclass clazz,
jint port, jlong eventAddress)
{
int res;
port_event_t* ev = (port_event_t*)jlong_to_ptr(eventAddress);
- RESTARTABLE(port_get((int)port, ev, NULL), res);
+ res = port_get((int)port, ev, NULL);
if (res == -1) {
- JNU_ThrowIOExceptionWithLastError(env, "port_get");
+ if (errno == EINTR) {
+ return IOS_INTERRUPTED;
+ } else {
+ JNU_ThrowIOExceptionWithLastError(env, "port_get failed");
+ return IOS_THROWN;
+ }
}
+ return res;
}
JNIEXPORT jint JNICALL
@@ -125,9 +134,13 @@ Java_sun_nio_ch_SolarisEventPort_port_1getn(JNIEnv* env, jclass clazz,
}
res = port_getn((int)port, list, (uint_t)max, &n, tsp);
- if (res == -1) {
- if (errno != ETIME && errno != EINTR)
- JNU_ThrowIOExceptionWithLastError(env, "port_getn");
+ if (res == -1 && errno != ETIME) {
+ if (errno == EINTR) {
+ return IOS_INTERRUPTED;
+ } else {
+ JNU_ThrowIOExceptionWithLastError(env, "port_getn failed");
+ return IOS_THROWN;
+ }
}
return (jint)n;
diff --git a/src/java.base/unix/classes/module-info.java.extra b/src/java.base/unix/classes/module-info.java.extra
index f5683c11ac2..77a61d2fea6 100644
--- a/src/java.base/unix/classes/module-info.java.extra
+++ b/src/java.base/unix/classes/module-info.java.extra
@@ -23,3 +23,4 @@
* questions.
*/
+exports sun.nio.cs to java.desktop;
diff --git a/src/java.base/unix/classes/sun/nio/ch/PipeImpl.java b/src/java.base/unix/classes/sun/nio/ch/PipeImpl.java
index 0e8a5492451..f4ef6ce1471 100644
--- a/src/java.base/unix/classes/sun/nio/ch/PipeImpl.java
+++ b/src/java.base/unix/classes/sun/nio/ch/PipeImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2018, 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
@@ -38,7 +38,7 @@ class PipeImpl
private final SourceChannel source;
private final SinkChannel sink;
- PipeImpl(SelectorProvider sp) {
+ PipeImpl(SelectorProvider sp) throws IOException {
long pipeFds = IOUtil.makePipe(true);
int readFd = (int) (pipeFds >>> 32);
int writeFd = (int) pipeFds;
diff --git a/src/java.base/unix/classes/sun/nio/ch/PollSelectorImpl.java b/src/java.base/unix/classes/sun/nio/ch/PollSelectorImpl.java
index 27c7a41937e..9c20a326288 100644
--- a/src/java.base/unix/classes/sun/nio/ch/PollSelectorImpl.java
+++ b/src/java.base/unix/classes/sun/nio/ch/PollSelectorImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2018, 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
@@ -51,7 +51,7 @@ class PollSelectorImpl
* Package private constructor called by factory method in
* the abstract superclass Selector.
*/
- PollSelectorImpl(SelectorProvider sp) {
+ PollSelectorImpl(SelectorProvider sp) throws IOException {
super(sp, 1, 1);
long pipeFds = IOUtil.makePipe(false);
fd0 = (int) (pipeFds >>> 32);
diff --git a/src/java.base/unix/classes/sun/nio/ch/SocketDispatcher.java b/src/java.base/unix/classes/sun/nio/ch/SocketDispatcher.java
index 1c5f8ef3385..69749651b92 100644
--- a/src/java.base/unix/classes/sun/nio/ch/SocketDispatcher.java
+++ b/src/java.base/unix/classes/sun/nio/ch/SocketDispatcher.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2018, 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
@@ -25,15 +25,15 @@
package sun.nio.ch;
-import java.io.*;
+import java.io.FileDescriptor;
+import java.io.IOException;
/**
* Allows different platforms to call different native methods
* for read and write operations.
*/
-class SocketDispatcher extends NativeDispatcher
-{
+class SocketDispatcher extends NativeDispatcher {
int read(FileDescriptor fd, long address, int len) throws IOException {
return FileDispatcherImpl.read0(fd, address, len);
diff --git a/src/java.base/unix/classes/sun/nio/fs/UnixFileStore.java b/src/java.base/unix/classes/sun/nio/fs/UnixFileStore.java
index 4a577e60a09..6693cbf86e5 100644
--- a/src/java.base/unix/classes/sun/nio/fs/UnixFileStore.java
+++ b/src/java.base/unix/classes/sun/nio/fs/UnixFileStore.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2018, 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
@@ -260,7 +260,7 @@ abstract class UnixFileStore
private static Properties loadProperties() {
Properties result = new Properties();
String fstypes = System.getProperty("java.home") + "/lib/fstypes.properties";
- Path file = Paths.get(fstypes);
+ Path file = Path.of(fstypes);
try {
try (ReadableByteChannel rbc = Files.newByteChannel(file)) {
result.load(Channels.newReader(rbc, "UTF-8"));
diff --git a/src/java.base/unix/native/libnio/ch/IOUtil.c b/src/java.base/unix/native/libnio/ch/IOUtil.c
index 2a5ff23c6b9..26d3e22b150 100644
--- a/src/java.base/unix/native/libnio/ch/IOUtil.c
+++ b/src/java.base/unix/native/libnio/ch/IOUtil.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2018, 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
@@ -104,10 +104,19 @@ Java_sun_nio_ch_IOUtil_makePipe(JNIEnv *env, jobject this, jboolean blocking)
return ((jlong) fd[0] << 32) | (jlong) fd[1];
}
+
+JNIEXPORT jint JNICALL
+Java_sun_nio_ch_IOUtil_write1(JNIEnv *env, jclass cl, jint fd, jbyte b)
+{
+ char c = (char)b;
+ return convertReturnVal(env, write(fd, &c, 1), JNI_FALSE);
+}
+
+
JNIEXPORT jboolean JNICALL
Java_sun_nio_ch_IOUtil_drain(JNIEnv *env, jclass cl, jint fd)
{
- char buf[128];
+ char buf[16];
int tn = 0;
for (;;) {
diff --git a/src/java.base/unix/native/libnio/ch/Net.c b/src/java.base/unix/native/libnio/ch/Net.c
index ae75d7c368c..b89f019d6a5 100644
--- a/src/java.base/unix/native/libnio/ch/Net.c
+++ b/src/java.base/unix/native/libnio/ch/Net.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2018, 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
@@ -293,8 +293,7 @@ Java_sun_nio_ch_Net_connect0(JNIEnv *env, jclass clazz, jboolean preferIPv6,
int sa_len = 0;
int rv;
- if (NET_InetAddressToSockaddr(env, iao, port, &sa, &sa_len,
- preferIPv6) != 0) {
+ if (NET_InetAddressToSockaddr(env, iao, port, &sa, &sa_len, preferIPv6) != 0) {
return IOS_THROWN;
}
@@ -761,11 +760,11 @@ handleSocketError(JNIEnv *env, jint errorValue)
break;
#endif
case ECONNREFUSED:
- xn = JNU_JAVANETPKG "ConnectException";
- break;
case ETIMEDOUT:
+ case ENOTCONN:
xn = JNU_JAVANETPKG "ConnectException";
break;
+
case EHOSTUNREACH:
xn = JNU_JAVANETPKG "NoRouteToHostException";
break;
diff --git a/src/java.base/unix/native/libnio/ch/SocketChannelImpl.c b/src/java.base/unix/native/libnio/ch/SocketChannelImpl.c
index 2d8370c9763..52e71a9cb80 100644
--- a/src/java.base/unix/native/libnio/ch/SocketChannelImpl.c
+++ b/src/java.base/unix/native/libnio/ch/SocketChannelImpl.c
@@ -59,23 +59,29 @@ Java_sun_nio_ch_SocketChannelImpl_checkConnect(JNIEnv *env, jobject this,
poller.events = POLLOUT;
poller.revents = 0;
result = poll(&poller, 1, block ? -1 : 0);
+
if (result < 0) {
- JNU_ThrowIOExceptionWithLastError(env, "Poll failed");
- return IOS_THROWN;
+ if (errno == EINTR) {
+ return IOS_INTERRUPTED;
+ } else {
+ JNU_ThrowIOExceptionWithLastError(env, "poll failed");
+ return IOS_THROWN;
+ }
}
if (!block && (result == 0))
- return IOS_UNAVAILABLE;
+ return IOS_UNAVAILABLE;
- if (poller.revents) {
+ if (result > 0) {
errno = 0;
result = getsockopt(fd, SOL_SOCKET, SO_ERROR, &error, &n);
if (result < 0) {
- handleSocketError(env, errno);
- return JNI_FALSE;
+ return handleSocketError(env, errno);
} else if (error) {
- handleSocketError(env, error);
- return JNI_FALSE;
+ return handleSocketError(env, error);
+ } else if ((poller.revents & POLLHUP) != 0) {
+ return handleSocketError(env, ENOTCONN);
}
+ // connected
return 1;
}
return 0;
diff --git a/src/java.base/windows/classes/java/io/WinNTFileSystem.java b/src/java.base/windows/classes/java/io/WinNTFileSystem.java
index 6dff3c20945..94cac268ceb 100644
--- a/src/java.base/windows/classes/java/io/WinNTFileSystem.java
+++ b/src/java.base/windows/classes/java/io/WinNTFileSystem.java
@@ -50,7 +50,7 @@ class WinNTFileSystem extends FileSystem {
slash = props.getProperty("file.separator").charAt(0);
semicolon = props.getProperty("path.separator").charAt(0);
altSlash = (this.slash == '\\') ? '/' : '\\';
- userDir = props.getProperty("user.dir");
+ userDir = normalize(props.getProperty("user.dir"));
}
private boolean isSlash(char c) {
diff --git a/src/java.base/windows/classes/java/net/PlainSocketImpl.java b/src/java.base/windows/classes/java/net/PlainSocketImpl.java
index 84dd3d4b515..6c27d775a84 100644
--- a/src/java.base/windows/classes/java/net/PlainSocketImpl.java
+++ b/src/java.base/windows/classes/java/net/PlainSocketImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, 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
@@ -43,8 +43,7 @@ import sun.security.action.GetPropertyAction;
* @author Chris Hegarty
*/
-class PlainSocketImpl extends AbstractPlainSocketImpl
-{
+class PlainSocketImpl extends AbstractPlainSocketImpl {
private AbstractPlainSocketImpl impl;
/* java.net.preferIPv4Stack */
@@ -254,22 +253,14 @@ class PlainSocketImpl extends AbstractPlainSocketImpl
impl.releaseFD();
}
- public boolean isConnectionReset() {
+ boolean isConnectionReset() {
return impl.isConnectionReset();
}
- public boolean isConnectionResetPending() {
- return impl.isConnectionResetPending();
- }
-
- public void setConnectionReset() {
+ void setConnectionReset() {
impl.setConnectionReset();
}
- public void setConnectionResetPending() {
- impl.setConnectionResetPending();
- }
-
public boolean isClosedOrPending() {
return impl.isClosedOrPending();
}
diff --git a/src/java.base/windows/classes/sun/nio/ch/WindowsSelectorImpl.java b/src/java.base/windows/classes/sun/nio/ch/WindowsSelectorImpl.java
index 8e01c9e7332..76f7ed84cc5 100644
--- a/src/java.base/windows/classes/sun/nio/ch/WindowsSelectorImpl.java
+++ b/src/java.base/windows/classes/sun/nio/ch/WindowsSelectorImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2018, 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
@@ -48,7 +48,7 @@ import java.util.Iterator;
* @author Mark Reinhold
*/
-final class WindowsSelectorImpl extends SelectorImpl {
+class WindowsSelectorImpl extends SelectorImpl {
// Initial capacity of the poll array
private final int INIT_CAP = 8;
// Maximum number of sockets for select().
@@ -81,7 +81,7 @@ final class WindowsSelectorImpl extends SelectorImpl {
private final int wakeupSourceFd, wakeupSinkFd;
// Lock for close cleanup
- private Object closeLock = new Object();
+ private final Object closeLock = new Object();
// Maps file descriptors to their indices in pollArray
private static final class FdMap extends HashMap {
@@ -135,6 +135,7 @@ final class WindowsSelectorImpl extends SelectorImpl {
pollWrapper.addWakeupSocket(wakeupSourceFd, 0);
}
+ @Override
protected int doSelect(long timeout) throws IOException {
if (channelArray == null)
throw new ClosedSelectorException();
@@ -500,6 +501,7 @@ final class WindowsSelectorImpl extends SelectorImpl {
return numKeysUpdated;
}
+ @Override
protected void implClose() throws IOException {
synchronized (closeLock) {
if (channelArray != null) {
@@ -520,7 +522,6 @@ final class WindowsSelectorImpl extends SelectorImpl {
}
pollWrapper.free();
pollWrapper = null;
- selectedKeys = null;
channelArray = null;
// Make all remaining helper threads exit
for (SelectThread t: threads)
diff --git a/src/java.base/windows/native/libjava/java_props_md.c b/src/java.base/windows/native/libjava/java_props_md.c
index 6d4d3f05bd7..971cf47c771 100644
--- a/src/java.base/windows/native/libjava/java_props_md.c
+++ b/src/java.base/windows/native/libjava/java_props_md.c
@@ -629,7 +629,6 @@ GetJavaProperties(JNIEnv* env)
* user.language
* user.script, user.country, user.variant (if user's environment specifies them)
* file.encoding
- * file.encoding.pkg
*/
{
/*
diff --git a/src/java.base/windows/native/libnet/NetworkInterface_winXP.c b/src/java.base/windows/native/libnet/NetworkInterface_winXP.c
index c458a173516..914b967cd93 100644
--- a/src/java.base/windows/native/libnet/NetworkInterface_winXP.c
+++ b/src/java.base/windows/native/libnet/NetworkInterface_winXP.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2018, 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
@@ -39,14 +39,15 @@ int getAddrsFromAdapter(IP_ADAPTER_ADDRESSES *ptr, netaddr **netaddrPP);
#ifdef DEBUG
void printnif (netif *nif) {
#ifdef _WIN64
- printf ("nif:0x%I64x name:%s\n", nif,nif->name);
+ printf ("nif:0x%I64x name:%s\n", (UINT_PTR)nif, nif->name);
#else
- printf ("nif:0x%x name:%s\n", nif,nif->name);
+ printf ("nif:0x%x name:%s\n", nif, nif->name);
#endif
if (nif->dNameIsUnicode) {
- printf ("dName:%S index:%d ", nif->displayName,nif->index);
+ printf ("dName:%S index:%d ", (unsigned short *)nif->displayName,
+ nif->index);
} else {
- printf ("dName:%s index:%d ", nif->displayName,nif->index);
+ printf ("dName:%s index:%d ", nif->displayName, nif->index);
}
printf ("naddrs:%d\n", nif->naddrs);
}
diff --git a/src/java.base/windows/native/libnio/ch/SocketChannelImpl.c b/src/java.base/windows/native/libnio/ch/SocketChannelImpl.c
index d1d529f52d2..9078a83055e 100644
--- a/src/java.base/windows/native/libnio/ch/SocketChannelImpl.c
+++ b/src/java.base/windows/native/libnio/ch/SocketChannelImpl.c
@@ -58,9 +58,7 @@ Java_sun_nio_ch_SocketChannelImpl_checkConnect(JNIEnv *env, jobject this,
jobject fdo, jboolean block)
{
int optError = 0;
- int lastError = 0;
- int result = 0;
- int retry = 0;
+ int result;
int n = sizeof(int);
jint fd = fdval(env, fdo);
fd_set wr, ex;
@@ -73,64 +71,33 @@ Java_sun_nio_ch_SocketChannelImpl_checkConnect(JNIEnv *env, jobject this,
result = select(fd+1, 0, &wr, &ex, block ? NULL : &t);
- /* save last winsock error */
- if (result == SOCKET_ERROR) {
- lastError = WSAGetLastError();
- }
-
- if (block) { /* must configure socket back to blocking state */
- u_long argp = 0;
- int r = ioctlsocket(fd, FIONBIO, &argp);
- if (r == SOCKET_ERROR) {
- handleSocketError(env, WSAGetLastError());
- }
- }
-
if (result == 0) { /* timeout */
return block ? 0 : IOS_UNAVAILABLE;
} else {
- if (result == SOCKET_ERROR) { /* select failed */
- handleSocketError(env, lastError);
+ if (result == SOCKET_ERROR) { /* select failed */
+ handleSocketError(env, WSAGetLastError());
return IOS_THROWN;
}
}
- /*
- * Socket is writable or error occurred. On some Windows editions
- * the socket will appear writable when the connect fails so we
- * check for error rather than writable.
- */
- if (!FD_ISSET(fd, &ex)) {
- return 1; /* connection established */
+ // connection established if writable and no error to check
+ if (FD_ISSET(fd, &wr) && !FD_ISSET(fd, &ex)) {
+ return 1;
}
- /*
- * A getsockopt( SO_ERROR ) may indicate success on NT4 even
- * though the connection has failed. The workaround is to allow
- * winsock to be scheduled and this is done via by yielding.
- * As the yield approach is problematic in heavy load situations
- * we attempt up to 3 times to get the failure reason.
- */
- for (retry=0; retry<3; retry++) {
- result = getsockopt((SOCKET)fd,
- SOL_SOCKET,
- SO_ERROR,
- (char *)&optError,
- &n);
- if (result == SOCKET_ERROR) {
- int lastError = WSAGetLastError();
- if (lastError == WSAEINPROGRESS) {
- return IOS_UNAVAILABLE;
- }
- NET_ThrowNew(env, lastError, "getsockopt");
- return IOS_THROWN;
+ result = getsockopt((SOCKET)fd,
+ SOL_SOCKET,
+ SO_ERROR,
+ (char *)&optError,
+ &n);
+ if (result == SOCKET_ERROR) {
+ int lastError = WSAGetLastError();
+ if (lastError == WSAEINPROGRESS) {
+ return IOS_UNAVAILABLE;
}
- if (optError) {
- break;
- }
- Sleep(0);
+ NET_ThrowNew(env, lastError, "getsockopt");
+ return IOS_THROWN;
}
-
if (optError != NO_ERROR) {
handleSocketError(env, optError);
return IOS_THROWN;
diff --git a/src/java.desktop/unix/native/libjsound/PLATFORM_API_LinuxOS_ALSA_CommonUtils.c b/src/java.desktop/linux/native/libjsound/PLATFORM_API_LinuxOS_ALSA_CommonUtils.c
similarity index 100%
rename from src/java.desktop/unix/native/libjsound/PLATFORM_API_LinuxOS_ALSA_CommonUtils.c
rename to src/java.desktop/linux/native/libjsound/PLATFORM_API_LinuxOS_ALSA_CommonUtils.c
diff --git a/src/java.desktop/unix/native/libjsound/PLATFORM_API_LinuxOS_ALSA_CommonUtils.h b/src/java.desktop/linux/native/libjsound/PLATFORM_API_LinuxOS_ALSA_CommonUtils.h
similarity index 100%
rename from src/java.desktop/unix/native/libjsound/PLATFORM_API_LinuxOS_ALSA_CommonUtils.h
rename to src/java.desktop/linux/native/libjsound/PLATFORM_API_LinuxOS_ALSA_CommonUtils.h
diff --git a/src/java.desktop/unix/native/libjsound/PLATFORM_API_LinuxOS_ALSA_MidiIn.c b/src/java.desktop/linux/native/libjsound/PLATFORM_API_LinuxOS_ALSA_MidiIn.c
similarity index 100%
rename from src/java.desktop/unix/native/libjsound/PLATFORM_API_LinuxOS_ALSA_MidiIn.c
rename to src/java.desktop/linux/native/libjsound/PLATFORM_API_LinuxOS_ALSA_MidiIn.c
diff --git a/src/java.desktop/unix/native/libjsound/PLATFORM_API_LinuxOS_ALSA_MidiOut.c b/src/java.desktop/linux/native/libjsound/PLATFORM_API_LinuxOS_ALSA_MidiOut.c
similarity index 100%
rename from src/java.desktop/unix/native/libjsound/PLATFORM_API_LinuxOS_ALSA_MidiOut.c
rename to src/java.desktop/linux/native/libjsound/PLATFORM_API_LinuxOS_ALSA_MidiOut.c
diff --git a/src/java.desktop/unix/native/libjsound/PLATFORM_API_LinuxOS_ALSA_MidiUtils.c b/src/java.desktop/linux/native/libjsound/PLATFORM_API_LinuxOS_ALSA_MidiUtils.c
similarity index 100%
rename from src/java.desktop/unix/native/libjsound/PLATFORM_API_LinuxOS_ALSA_MidiUtils.c
rename to src/java.desktop/linux/native/libjsound/PLATFORM_API_LinuxOS_ALSA_MidiUtils.c
diff --git a/src/java.desktop/unix/native/libjsound/PLATFORM_API_LinuxOS_ALSA_MidiUtils.h b/src/java.desktop/linux/native/libjsound/PLATFORM_API_LinuxOS_ALSA_MidiUtils.h
similarity index 100%
rename from src/java.desktop/unix/native/libjsound/PLATFORM_API_LinuxOS_ALSA_MidiUtils.h
rename to src/java.desktop/linux/native/libjsound/PLATFORM_API_LinuxOS_ALSA_MidiUtils.h
diff --git a/src/java.desktop/unix/native/libjsound/PLATFORM_API_LinuxOS_ALSA_PCM.c b/src/java.desktop/linux/native/libjsound/PLATFORM_API_LinuxOS_ALSA_PCM.c
similarity index 100%
rename from src/java.desktop/unix/native/libjsound/PLATFORM_API_LinuxOS_ALSA_PCM.c
rename to src/java.desktop/linux/native/libjsound/PLATFORM_API_LinuxOS_ALSA_PCM.c
diff --git a/src/java.desktop/unix/native/libjsound/PLATFORM_API_LinuxOS_ALSA_PCMUtils.c b/src/java.desktop/linux/native/libjsound/PLATFORM_API_LinuxOS_ALSA_PCMUtils.c
similarity index 100%
rename from src/java.desktop/unix/native/libjsound/PLATFORM_API_LinuxOS_ALSA_PCMUtils.c
rename to src/java.desktop/linux/native/libjsound/PLATFORM_API_LinuxOS_ALSA_PCMUtils.c
diff --git a/src/java.desktop/unix/native/libjsound/PLATFORM_API_LinuxOS_ALSA_PCMUtils.h b/src/java.desktop/linux/native/libjsound/PLATFORM_API_LinuxOS_ALSA_PCMUtils.h
similarity index 100%
rename from src/java.desktop/unix/native/libjsound/PLATFORM_API_LinuxOS_ALSA_PCMUtils.h
rename to src/java.desktop/linux/native/libjsound/PLATFORM_API_LinuxOS_ALSA_PCMUtils.h
diff --git a/src/java.desktop/unix/native/libjsound/PLATFORM_API_LinuxOS_ALSA_Ports.c b/src/java.desktop/linux/native/libjsound/PLATFORM_API_LinuxOS_ALSA_Ports.c
similarity index 100%
rename from src/java.desktop/unix/native/libjsound/PLATFORM_API_LinuxOS_ALSA_Ports.c
rename to src/java.desktop/linux/native/libjsound/PLATFORM_API_LinuxOS_ALSA_Ports.c
diff --git a/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java
index ef917176512..9bcd46c9fc5 100644
--- a/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java
+++ b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java
@@ -382,8 +382,6 @@ public class CPlatformWindow extends CFRetainedResource implements PlatformWindo
styleBits = SET(styleBits, RESIZABLE, resizable);
if (!resizable) {
styleBits = SET(styleBits, ZOOMABLE, false);
- } else {
- setCanFullscreen(true);
}
}
@@ -677,6 +675,15 @@ public class CPlatformWindow extends CFRetainedResource implements PlatformWindo
// Manage the extended state when showing
if (visible) {
+ /* Frame or Dialog should be set property WINDOW_FULLSCREENABLE to true if the
+ Frame or Dialog is resizable.
+ **/
+ final boolean resizable = (target instanceof Frame) ? ((Frame)target).isResizable() :
+ ((target instanceof Dialog) ? ((Dialog)target).isResizable() : false);
+ if (resizable) {
+ setCanFullscreen(true);
+ }
+
// Apply the extended state as expected in shared code
if (target instanceof Frame) {
if (!wasMaximized && isMaximized()) {
@@ -852,7 +859,7 @@ public class CPlatformWindow extends CFRetainedResource implements PlatformWindo
@Override
public void updateFocusableWindowState() {
final boolean isFocusable = isNativelyFocusableWindow();
- setStyleBits(SHOULD_BECOME_KEY | SHOULD_BECOME_MAIN, isFocusable); // set both bits at once
+ setStyleBits(SHOULD_BECOME_KEY | SHOULD_BECOME_MAIN | RESIZABLE, isFocusable); // set bits at once
}
@Override
diff --git a/src/java.desktop/share/classes/com/sun/imageio/plugins/bmp/BMPConstants.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/bmp/BMPConstants.java
index 9f510c5bacb..f4c1fc55fd8 100644
--- a/src/java.desktop/share/classes/com/sun/imageio/plugins/bmp/BMPConstants.java
+++ b/src/java.desktop/share/classes/com/sun/imageio/plugins/bmp/BMPConstants.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2018, 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
@@ -30,6 +30,7 @@ public interface BMPConstants {
static final String VERSION_2 = "BMP v. 2.x";
static final String VERSION_3 = "BMP v. 3.x";
static final String VERSION_3_NT = "BMP v. 3.x NT";
+ static final String VERSION_3_EXT = "BMP V2/V3 INFO";
static final String VERSION_4 = "BMP v. 4.x";
static final String VERSION_5 = "BMP v. 5.x";
@@ -48,3 +49,4 @@ public interface BMPConstants {
static final int BI_JPEG = 4;
static final int BI_PNG = 5;
}
+
diff --git a/src/java.desktop/share/classes/com/sun/imageio/plugins/bmp/BMPImageReader.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/bmp/BMPImageReader.java
index 81baecc21cb..5282c4173f7 100644
--- a/src/java.desktop/share/classes/com/sun/imageio/plugins/bmp/BMPImageReader.java
+++ b/src/java.desktop/share/classes/com/sun/imageio/plugins/bmp/BMPImageReader.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2018, 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
@@ -78,6 +78,8 @@ import com.sun.imageio.plugins.common.I18N;
*
* This class supports Microsoft Windows Bitmap Version 3-5,
* as well as OS/2 Bitmap Version 2.x (for single-image BMP file).
+ * It also supports undocumented DIB header of type BITMAPV2INFOHEADER
+ * & BITMAPV3INFOHEADER.
*/
public class BMPImageReader extends ImageReader implements BMPConstants {
// BMP Image types
@@ -94,16 +96,25 @@ public class BMPImageReader extends ImageReader implements BMPConstants {
private static final int VERSION_3_NT_16_BIT = 8;
private static final int VERSION_3_NT_32_BIT = 9;
- private static final int VERSION_4_1_BIT = 10;
- private static final int VERSION_4_4_BIT = 11;
- private static final int VERSION_4_8_BIT = 12;
- private static final int VERSION_4_16_BIT = 13;
- private static final int VERSION_4_24_BIT = 14;
- private static final int VERSION_4_32_BIT = 15;
+ // All VERSION_3_EXT_* are for BITMAPV2INFOHEADER & BITMAPV3INFOHEADER
+ private static final int VERSION_3_EXT_1_BIT = 10;
+ private static final int VERSION_3_EXT_4_BIT = 11;
+ private static final int VERSION_3_EXT_8_BIT = 12;
+ private static final int VERSION_3_EXT_16_BIT = 13;
+ private static final int VERSION_3_EXT_24_BIT = 14;
+ private static final int VERSION_3_EXT_32_BIT = 15;
- private static final int VERSION_3_XP_EMBEDDED = 16;
- private static final int VERSION_4_XP_EMBEDDED = 17;
- private static final int VERSION_5_XP_EMBEDDED = 18;
+ private static final int VERSION_4_1_BIT = 16;
+ private static final int VERSION_4_4_BIT = 17;
+ private static final int VERSION_4_8_BIT = 18;
+ private static final int VERSION_4_16_BIT = 19;
+ private static final int VERSION_4_24_BIT = 20;
+ private static final int VERSION_4_32_BIT = 21;
+
+ private static final int VERSION_3_XP_EMBEDDED = 22;
+ private static final int VERSION_3_EXT_EMBEDDED = 23;
+ private static final int VERSION_4_XP_EMBEDDED = 24;
+ private static final int VERSION_5_XP_EMBEDDED = 25;
// BMP variables
private long bitmapFileSize;
@@ -409,6 +420,63 @@ public class BMPImageReader extends ImageReader implements BMPConstants {
throw new
IIOException(I18N.getString("BMPImageReader2"));
}
+ } else if (size == 52 || size == 56) {
+ // BITMAPV2INFOHEADER or BITMAPV3INFOHEADER
+ redMask = (int)iis.readUnsignedInt();
+ greenMask = (int)iis.readUnsignedInt();
+ blueMask = (int)iis.readUnsignedInt();
+ if (size == 56) {
+ alphaMask = (int)iis.readUnsignedInt();
+ }
+
+ metadata.bmpVersion = VERSION_3_EXT;
+ // Read in the palette
+ int numberOfEntries = (int)((bitmapOffset-14-size) / 4);
+ int sizeOfPalette = numberOfEntries*4;
+ palette = new byte[sizeOfPalette];
+ iis.readFully(palette, 0, sizeOfPalette);
+ metadata.palette = palette;
+ metadata.paletteSize = numberOfEntries;
+
+ switch((int)compression) {
+
+ case BI_JPEG:
+ case BI_PNG:
+ imageType = VERSION_3_EXT_EMBEDDED;
+ break;
+ default:
+ if (bitsPerPixel == 1) {
+ imageType = VERSION_3_EXT_1_BIT;
+ } else if (bitsPerPixel == 4) {
+ imageType = VERSION_3_EXT_4_BIT;
+ } else if (bitsPerPixel == 8) {
+ imageType = VERSION_3_EXT_8_BIT;
+ } else if (bitsPerPixel == 16) {
+ imageType = VERSION_3_EXT_16_BIT;
+ if ((int)compression == BI_RGB) {
+ redMask = 0x7C00;
+ greenMask = 0x3E0;
+ blueMask = 0x1F;
+ }
+ } else if (bitsPerPixel == 24) {
+ imageType = VERSION_3_EXT_24_BIT;
+ } else if (bitsPerPixel == 32) {
+ imageType = VERSION_3_EXT_32_BIT;
+ if ((int)compression == BI_RGB) {
+ redMask = 0x00FF0000;
+ greenMask = 0x0000FF00;
+ blueMask = 0x000000FF;
+ }
+ } else {
+ throw new
+ IIOException(I18N.getString("BMPImageReader8"));
+ }
+
+ metadata.redMask = redMask;
+ metadata.greenMask = greenMask;
+ metadata.blueMask = blueMask;
+ metadata.alphaMask = alphaMask;
+ }
} else if (size == 108 || size == 124) {
// Windows 4.x BMP
if (size == 108)
@@ -908,15 +976,18 @@ public class BMPImageReader extends ImageReader implements BMPConstants {
break;
case VERSION_3_XP_EMBEDDED:
+ case VERSION_3_EXT_EMBEDDED:
case VERSION_4_XP_EMBEDDED:
case VERSION_5_XP_EMBEDDED:
bi = readEmbedded((int)compression, bi, param);
break;
+ case VERSION_3_EXT_1_BIT:
case VERSION_4_1_BIT:
read1Bit(bdata);
break;
+ case VERSION_3_EXT_4_BIT:
case VERSION_4_4_BIT:
switch((int)compression) {
@@ -934,6 +1005,7 @@ public class BMPImageReader extends ImageReader implements BMPConstants {
}
break;
+ case VERSION_3_EXT_8_BIT:
case VERSION_4_8_BIT:
switch((int)compression) {
@@ -951,14 +1023,17 @@ public class BMPImageReader extends ImageReader implements BMPConstants {
}
break;
+ case VERSION_3_EXT_16_BIT:
case VERSION_4_16_BIT:
read16Bit(sdata);
break;
+ case VERSION_3_EXT_24_BIT:
case VERSION_4_24_BIT:
read24Bit(bdata);
break;
+ case VERSION_3_EXT_32_BIT:
case VERSION_4_32_BIT:
read32Bit(idata);
break;
@@ -2000,3 +2075,4 @@ public class BMPImageReader extends ImageReader implements BMPConstants {
}
}
}
+
diff --git a/src/java.desktop/share/classes/com/sun/imageio/plugins/gif/GIFImageMetadataFormat.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/gif/GIFImageMetadataFormat.java
index fa982d7e698..fa55d72bbda 100644
--- a/src/java.desktop/share/classes/com/sun/imageio/plugins/gif/GIFImageMetadataFormat.java
+++ b/src/java.desktop/share/classes/com/sun/imageio/plugins/gif/GIFImageMetadataFormat.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2018, 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
@@ -119,10 +119,10 @@ public class GIFImageMetadataFormat extends IIOMetadataFormatImpl {
"1", "65535", true, true);
addAttribute("PlainTextExtension", "characterCellWidth",
DATATYPE_INTEGER, true, null,
- "1", "65535", true, true);
+ "1", "255", true, true);
addAttribute("PlainTextExtension", "characterCellHeight",
DATATYPE_INTEGER, true, null,
- "1", "65535", true, true);
+ "1", "255", true, true);
addAttribute("PlainTextExtension", "textForegroundColor",
DATATYPE_INTEGER, true, null,
"0", "255", true, true);
diff --git a/src/java.desktop/share/classes/com/sun/imageio/plugins/gif/GIFWritableImageMetadata.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/gif/GIFWritableImageMetadata.java
index 41621151d1e..dc780602a90 100644
--- a/src/java.desktop/share/classes/com/sun/imageio/plugins/gif/GIFWritableImageMetadata.java
+++ b/src/java.desktop/share/classes/com/sun/imageio/plugins/gif/GIFWritableImageMetadata.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2018, 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
@@ -203,15 +203,18 @@ class GIFWritableImageMetadata extends GIFImageMetadata {
-1, true,
true, 1, 65535);
+ // As per the specification (89a), character cell width
+ // and character cell height occupy one byte each
+ // in the Plain Text Extension block.
characterCellWidth = getIntAttribute(node,
"characterCellWidth",
-1, true,
- true, 1, 65535);
+ true, 1, 255);
characterCellHeight = getIntAttribute(node,
"characterCellHeight",
-1, true,
- true, 1, 65535);
+ true, 1, 255);
textForegroundColor = getIntAttribute(node,
"textForegroundColor",
diff --git a/src/java.desktop/share/classes/com/sun/media/sound/Platform.java b/src/java.desktop/share/classes/com/sun/media/sound/Platform.java
index 3b24ceb679a..2c200a3730d 100644
--- a/src/java.desktop/share/classes/com/sun/media/sound/Platform.java
+++ b/src/java.desktop/share/classes/com/sun/media/sound/Platform.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2018, 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
@@ -38,23 +38,9 @@ import java.util.StringTokenizer;
final class Platform {
// native library we need to load
- private static final String libNameMain = "jsound";
- private static final String libNameALSA = "jsoundalsa";
- private static final String libNameDSound = "jsoundds";
+ private static final String libName = "jsound";
- // extra libs handling: bit flags for each different library
- public static final int LIB_MAIN = 1;
- public static final int LIB_ALSA = 2;
- public static final int LIB_DSOUND = 4;
-
- // bit field of the constants above. Willbe set in loadLibraries
- private static int loadedLibs = 0;
-
- // features: the main native library jsound reports which feature is
- // contained in which lib
- public static final int FEATURE_MIDIIO = 1;
- public static final int FEATURE_PORTS = 2;
- public static final int FEATURE_DIRECT_AUDIO = 3;
+ private static boolean isNativeLibLoaded;
// SYSTEM CHARACTERISTICS
// vary according to hardware architecture
@@ -66,7 +52,6 @@ final class Platform {
if(Printer.trace)Printer.trace(">> Platform.java: static");
loadLibraries();
- readProperties();
}
/**
@@ -95,72 +80,37 @@ final class Platform {
private static void loadLibraries() {
if(Printer.trace)Printer.trace(">>Platform.loadLibraries");
- // load the main library
- AccessController.doPrivileged((PrivilegedAction) () -> {
- System.loadLibrary(libNameMain);
- return null;
- });
- // just for the heck of it...
- loadedLibs |= LIB_MAIN;
-
- // now try to load extra libs. They are defined at compile time in the Makefile
- // with the define EXTRA_SOUND_JNI_LIBS
- String extraLibs = nGetExtraLibraries();
- // the string is the libraries, separated by white space
- StringTokenizer st = new StringTokenizer(extraLibs);
- while (st.hasMoreTokens()) {
- final String lib = st.nextToken();
- try {
- AccessController.doPrivileged((PrivilegedAction) () -> {
- System.loadLibrary(lib);
- return null;
- });
-
- if (lib.equals(libNameALSA)) {
- loadedLibs |= LIB_ALSA;
- if (Printer.debug) Printer.debug("Loaded ALSA lib successfully.");
- } else if (lib.equals(libNameDSound)) {
- loadedLibs |= LIB_DSOUND;
- if (Printer.debug) Printer.debug("Loaded DirectSound lib successfully.");
- } else {
- if (Printer.err) Printer.err("Loaded unknown lib '"+lib+"' successfully.");
- }
- } catch (Throwable t) {
- if (Printer.err) Printer.err("Couldn't load library "+lib+": "+t.toString());
- }
+ // load the native library
+ isNativeLibLoaded = true;
+ try {
+ AccessController.doPrivileged((PrivilegedAction