Invoke the {@link #findClass(String)} method to find the
@@ -493,23 +493,23 @@
*
*
*
If the class was found using the above steps, and the
- * resolve flag is true, this method will then invoke the {@link
- * #resolveClass(Class)} method on the resulting Class object.
+ * {@code resolve} flag is true, this method will then invoke the {@link
+ * #resolveClass(Class)} method on the resulting {@code Class} object.
*
- *
Subclasses of ClassLoader are encouraged to override {@link
+ *
Subclasses of {@code ClassLoader} are encouraged to override {@link
* #findClass(String)}, rather than this method.
*
* Unless overridden, this method synchronizes on the result of
- * {@link #getClassLoadingLock getClassLoadingLock} method
+ * {@link #getClassLoadingLock getClassLoadingLock} method
* during the entire class loading process.
*
* @param name
* The binary name of the class
*
* @param resolve
- * If true then resolve the class
+ * If {@code true} then resolve the class
*
- * @return The resulting Class object
+ * @return The resulting {@code Class} object
*
* @throws ClassNotFoundException
* If the class could not be found
@@ -606,7 +606,7 @@
* @return the lock for class loading operations
*
* @throws NullPointerException
- * If registered as parallel capable and className is null
+ * If registered as parallel capable and {@code className} is null
*
* @see #loadClass(String, boolean)
*
@@ -667,14 +667,14 @@
* Finds the class with the specified binary name.
* This method should be overridden by class loader implementations that
* follow the delegation model for loading classes, and will be invoked by
- * the {@link #loadClass loadClass} method after checking the
+ * the {@link #loadClass loadClass} method after checking the
* parent class loader for the requested class. The default implementation
- * throws a ClassNotFoundException.
+ * throws a {@code ClassNotFoundException}.
*
* @param name
* The binary name of the class
*
- * @return The resulting Class object
+ * @return The resulting {@code Class} object
*
* @throws ClassNotFoundException
* If the class could not be found
@@ -722,32 +722,32 @@
/**
- * Converts an array of bytes into an instance of class Class.
- * Before the Class can be used it must be resolved. This method
+ * Converts an array of bytes into an instance of class {@code Class}.
+ * Before the {@code Class} can be used it must be resolved. This method
* is deprecated in favor of the version that takes a binary name as its first argument, and is more secure.
*
* @param b
* The bytes that make up the class data. The bytes in positions
- * off through off+len-1 should have the format
+ * {@code off} through {@code off+len-1} should have the format
* of a valid class file as defined by
* The Java™ Virtual Machine Specification.
*
* @param off
- * The start offset in b of the class data
+ * The start offset in {@code b} of the class data
*
* @param len
* The length of the class data
*
- * @return The Class object that was created from the specified
+ * @return The {@code Class} object that was created from the specified
* class data
*
* @throws ClassFormatError
* If the data did not contain a valid class
*
* @throws IndexOutOfBoundsException
- * If either off or len is negative, or if
- * off+len is greater than b.length.
+ * If either {@code off} or {@code len} is negative, or if
+ * {@code off+len} is greater than {@code b.length}.
*
* @throws SecurityException
* If an attempt is made to add this class to a package that
@@ -994,11 +994,11 @@
* #defineClass(String, byte[], int, int, ProtectionDomain)}.
*
*
An invocation of this method of the form
- * cl.defineClass(name,
- * bBuffer, pd) yields exactly the same
+ * cl{@code .defineClass(}name{@code ,}
+ * bBuffer{@code ,} pd{@code )} yields exactly the same
* result as the statements
*
- *
+ *
* ...
* byte[] temp = new byte[bBuffer.{@link
* java.nio.ByteBuffer#remaining remaining}()];
@@ -1007,16 +1007,16 @@
* return {@link #defineClass(String, byte[], int, int, ProtectionDomain)
* cl.defineClass}(name, temp, 0,
* temp.length, pd);
- *
+ *
*
* @param name
* The expected binary name. of the class, or
- * null if not known
+ * {@code null} if not known
*
* @param b
* The bytes that make up the class data. The bytes from positions
- * b.position() through b.position() + b.limit() -1
- * should have the format of a valid class file as defined by
+ * {@code b.position()} through {@code b.position() + b.limit() -1
+ * } should have the format of a valid class file as defined by
* The Java™ Virtual Machine Specification.
*
* @param protectionDomain
@@ -1158,7 +1158,7 @@
/**
* Links the specified class. This (misleadingly named) method may be
- * used by a class loader to link a class. If the class c has
+ * used by a class loader to link a class. If the class {@code c} has
* already been linked, then this method simply returns. Otherwise, the
* class is linked as described in the "Execution" chapter of
* The Java™ Language Specification.
@@ -1167,7 +1167,7 @@
* The class to link
*
* @throws NullPointerException
- * If c is null.
+ * If {@code c} is {@code null}.
*
* @see #defineClass(String, byte[], int, int)
*/
@@ -1182,16 +1182,16 @@
* loading it if necessary.
*
* This method loads the class through the system class loader (see
- * {@link #getSystemClassLoader()}). The Class object returned
- * might have more than one ClassLoader associated with it.
- * Subclasses of ClassLoader need not usually invoke this method,
+ * {@link #getSystemClassLoader()}). The {@code Class} object returned
+ * might have more than one {@code ClassLoader} associated with it.
+ * Subclasses of {@code ClassLoader} need not usually invoke this method,
* because most class loaders need to override just {@link
* #findClass(String)}.
*
* @param name
* The binary name of the class
*
- * @return The Class object for the specified name
+ * @return The {@code Class} object for the specified {@code name}
*
* @throws ClassNotFoundException
* If the class could not be found
@@ -1222,12 +1222,12 @@
* Returns the class with the given binary name if this
* loader has been recorded by the Java virtual machine as an initiating
* loader of a class with that binary name. Otherwise
- * null is returned.
+ * {@code null} is returned.
*
* @param name
* The binary name of the class
*
- * @return The Class object, or null if the class has
+ * @return The {@code Class} object, or {@code null} if the class has
* not been loaded
*
* @since 1.1
@@ -1245,7 +1245,7 @@
* class.
*
* @param c
- * The Class object
+ * The {@code Class} object
*
* @param signers
* The signers for the class
@@ -1306,11 +1306,11 @@
* (images, audio, text, etc) that can be accessed by class code in a way
* that is independent of the location of the code.
*
- * The name of a resource is a '/'-separated path name that
+ *
The name of a resource is a '{@code /}'-separated path name that
* identifies the resource.
*
*
This method will first search the parent class loader for the
- * resource; if the parent is null the path of the class loader
+ * resource; if the parent is {@code null} the path of the class loader
* built-in to the virtual machine is searched. That failing, this method
* will invoke {@link #findResource(String)} to find the resource.
*
@@ -1362,7 +1362,7 @@
* (images, audio, text, etc) that can be accessed by class code in a way
* that is independent of the location of the code.
*
- * The name of a resource is a /-separated path name that
+ *
The name of a resource is a {@code /}-separated path name that
* identifies the resource.
*
*
The delegation order for searching is described in the documentation
@@ -1389,7 +1389,7 @@
* @param name
* The resource name
*
- * @return An enumeration of {@link java.net.URL URL} objects for
+ * @return An enumeration of {@link java.net.URL URL} objects for
* the resource. If no resources could be found, the enumeration
* will be empty. Resources for which a {@code URL} cannot be
* constructed, are in package that is not opened unconditionally,
@@ -1505,7 +1505,7 @@
}
/**
- * Returns an enumeration of {@link java.net.URL URL} objects
+ * Returns an enumeration of {@link java.net.URL URL} objects
* representing all the resources with the given name. Class loader
* implementations should override this method to specify where to load
* resources from.
@@ -1520,7 +1520,7 @@
* @param name
* The resource name
*
- * @return An enumeration of {@link java.net.URL URL} objects for
+ * @return An enumeration of {@link java.net.URL URL} objects for
* the resource. If no resources could be found, the enumeration
* will be empty. Resources for which a {@code URL} cannot be
* constructed, are in a package that is not opened unconditionally,
@@ -1594,7 +1594,7 @@
* @param name
* The resource name
*
- * @return A {@link java.net.URL URL} to the resource; {@code
+ * @return A {@link java.net.URL URL} to the resource; {@code
* null} if the resource could not be found, a URL could not be
* constructed to locate the resource, the resource is in a package
* that is not opened unconditionally or access to the resource is
@@ -1609,8 +1609,8 @@
/**
* Finds all resources of the specified name from the search path used to
* load classes. The resources thus found are returned as an
- * {@link java.util.Enumeration Enumeration} of {@link
- * java.net.URL URL} objects.
+ * {@link java.util.Enumeration Enumeration} of {@link
+ * java.net.URL URL} objects.
*
*
The search order is described in the documentation for {@link
* #getSystemResource(String)}.
@@ -1625,7 +1625,7 @@
* @param name
* The resource name
*
- * @return An enumeration of {@link java.net.URL URL} objects for
+ * @return An enumeration of {@link java.net.URL URL} objects for
* the resource. If no resources could be found, the enumeration
* will be empty. Resources for which a {@code URL} cannot be
* constructed, are in a package that is not opened unconditionally,
@@ -1714,11 +1714,11 @@
/**
* Returns the parent class loader for delegation. Some implementations may
- * use null to represent the bootstrap class loader. This method
- * will return null in such implementations if this class loader's
+ * use {@code null} to represent the bootstrap class loader. This method
+ * will return {@code null} in such implementations if this class loader's
* parent is the bootstrap class loader.
*
- * @return The parent ClassLoader
+ * @return The parent {@code ClassLoader}
*
* @throws SecurityException
* If a security manager is present, and the caller's class loader
@@ -1785,7 +1785,7 @@
/**
* Returns the system class loader for delegation. This is the default
- * delegation parent for new ClassLoader instances, and is
+ * delegation parent for new {@code ClassLoader} instances, and is
* typically the class loader used to start the application.
*
* This method is first invoked early in the runtime's startup
@@ -1797,12 +1797,12 @@
*
The default system class loader is an implementation-dependent
* instance of this class.
*
- *
If the system property "java.system.class.loader" is defined
+ *
If the system property "{@code java.system.class.loader}" is defined
* when this method is first invoked then the value of that property is
* taken to be the name of a class that will be returned as the system
* class loader. The class is loaded using the default system class loader
* and must define a public constructor that takes a single parameter of
- * type ClassLoader which is used as the delegation parent. An
+ * type {@code ClassLoader} which is used as the delegation parent. An
* instance is then created using this constructor with the default system
* class loader as the parameter. The resulting class loader is defined
* to be the system class loader. During construction, the class loader
@@ -1825,7 +1825,7 @@
* the application module path then the class path defaults to
* the current working directory.
*
- * @return The system ClassLoader for delegation
+ * @return The system {@code ClassLoader} for delegation
*
* @throws SecurityException
* If a security manager is present, and the caller's class loader
@@ -1835,11 +1835,11 @@
*
* @throws IllegalStateException
* If invoked recursively during the construction of the class
- * loader specified by the "java.system.class.loader"
+ * loader specified by the "{@code java.system.class.loader}"
* property.
*
* @throws Error
- * If the system property "java.system.class.loader"
+ * If the system property "{@code java.system.class.loader}"
* is defined but the named class could not be loaded, the
* provider class does not define the required constructor, or an
* exception is thrown by that constructor when it is invoked. The
@@ -2249,9 +2249,9 @@
/**
* Returns the absolute path name of a native library. The VM invokes this
* method to locate the native libraries that belong to classes loaded with
- * this class loader. If this method returns null, the VM
+ * this class loader. If this method returns {@code null}, the VM
* searches the library along the path specified as the
- * "java.library.path" property.
+ * "{@code java.library.path}" property.
*
* @param libname
* The library name
@@ -2270,12 +2270,12 @@
/**
* The inner class NativeLibrary denotes a loaded native library instance.
* Every classloader contains a vector of loaded native libraries in the
- * private field nativeLibraries. The native libraries loaded
- * into the system are entered into the systemNativeLibraries
+ * private field {@code nativeLibraries}. The native libraries loaded
+ * into the system are entered into the {@code systemNativeLibraries}
* vector.
*
*
Every native library requires a particular version of JNI. This is
- * denoted by the private jniVersion field. This field is set by
+ * denoted by the private {@code jniVersion} field. This field is set by
* the VM when it loads the library, and used by the VM to pass the correct
* version of JNI to the native methods.
*
@@ -2592,8 +2592,8 @@
* #setClassAssertionStatus(String, boolean)}.
*
* @param enabled
- * true if classes loaded by this class loader will
- * henceforth have assertions enabled by default, false
+ * {@code true} if classes loaded by this class loader will
+ * henceforth have assertions enabled by default, {@code false}
* if they will have assertions disabled by default.
*
* @since 1.4
@@ -2614,16 +2614,16 @@
* any of its "subpackages".
*
* A subpackage of a package named p is any package whose name begins
- * with "p.". For example, javax.swing.text is a
- * subpackage of javax.swing, and both java.util and
- * java.lang.reflect are subpackages of java.
+ * with "{@code p.}". For example, {@code javax.swing.text} is a
+ * subpackage of {@code javax.swing}, and both {@code java.util} and
+ * {@code java.lang.reflect} are subpackages of {@code java}.
*
*
In the event that multiple package defaults apply to a given class,
* the package default pertaining to the most specific package takes
- * precedence over the others. For example, if javax.lang and
- * javax.lang.reflect both have package defaults associated with
+ * precedence over the others. For example, if {@code javax.lang} and
+ * {@code javax.lang.reflect} both have package defaults associated with
* them, the latter package default applies to classes in
- * javax.lang.reflect.
+ * {@code javax.lang.reflect}.
*
*
Package defaults take precedence over the class loader's default
* assertion status, and may be overridden on a per-class basis by invoking
@@ -2631,15 +2631,15 @@
*
* @param packageName
* The name of the package whose package default assertion status
- * is to be set. A null value indicates the unnamed
+ * is to be set. A {@code null} value indicates the unnamed
* package that is "current"
* (see section 7.4.2 of
* The Java™ Language Specification.)
*
* @param enabled
- * true if classes loaded by this classloader and
+ * {@code true} if classes loaded by this classloader and
* belonging to the named package or any of its subpackages will
- * have assertions enabled by default, false if they will
+ * have assertions enabled by default, {@code false} if they will
* have assertions disabled by default.
*
* @since 1.4
@@ -2670,8 +2670,8 @@
* assertion status is to be set.
*
* @param enabled
- * true if the named class is to have assertions
- * enabled when (and if) it is initialized, false if the
+ * {@code true} if the named class is to have assertions
+ * enabled when (and if) it is initialized, {@code false} if the
* class is to have assertions disabled.
*
* @since 1.4
@@ -2687,7 +2687,7 @@
/**
* Sets the default assertion status for this class loader to
- * false and discards any package defaults or class assertion
+ * {@code false} and discards any package defaults or class assertion
* status settings associated with the class loader. This method is
* provided so that class loaders can be made to ignore any command line or
* persistent assertion status settings and "start with a clean slate."
diff -r be8643ebe865 -r 6665640c56cf jdk/src/java.base/share/classes/java/net/URLConnection.java
--- a/jdk/src/java.base/share/classes/java/net/URLConnection.java Fri Jan 13 01:36:02 2017 +0000
+++ b/jdk/src/java.base/share/classes/java/net/URLConnection.java Wed Jul 05 22:41:30 2017 +0200
@@ -30,8 +30,10 @@
import java.io.OutputStream;
import java.security.PrivilegedAction;
import java.util.Hashtable;
+import java.util.concurrent.ConcurrentHashMap;
import java.util.Date;
import java.util.Iterator;
+import java.util.Locale;
import java.util.Objects;
import java.util.ServiceConfigurationError;
import java.util.ServiceLoader;
@@ -231,7 +233,7 @@
*/
protected boolean allowUserInteraction = defaultAllowUserInteraction;
- private static boolean defaultUseCaches = true;
+ private static volatile boolean defaultUseCaches = true;
/**
* If {@code true}, the protocol is allowed to use caching
@@ -243,12 +245,18 @@
*
* Its default value is the value given in the last invocation of the
* {@code setDefaultUseCaches} method.
+ *
+ * The default setting may be overridden per protocol with
+ * {@link #setDefaultUseCaches(String,boolean)}.
*
* @see java.net.URLConnection#setUseCaches(boolean)
* @see java.net.URLConnection#getUseCaches()
* @see java.net.URLConnection#setDefaultUseCaches(boolean)
*/
- protected boolean useCaches = defaultUseCaches;
+ protected boolean useCaches;
+
+ private static final ConcurrentHashMap defaultCaching =
+ new ConcurrentHashMap<>();
/**
* Some protocols support skipping the fetching of the object unless
@@ -460,6 +468,11 @@
*/
protected URLConnection(URL url) {
this.url = url;
+ if (url == null) {
+ this.useCaches = defaultUseCaches;
+ } else {
+ this.useCaches = getDefaultUseCaches(url.getProtocol());
+ }
}
/**
@@ -981,7 +994,8 @@
* is true, the connection is allowed to use whatever caches it can.
* If false, caches are to be ignored.
* The default value comes from DefaultUseCaches, which defaults to
- * true.
+ * true. A default value can also be set per-protocol using
+ * {@link #setDefaultUseCaches(String,boolean)}.
*
* @param usecaches a {@code boolean} indicating whether
* or not to allow caching
@@ -1032,9 +1046,10 @@
* Returns the default value of a {@code URLConnection}'s
* {@code useCaches} flag.
*
- * Ths default is "sticky", being a part of the static state of all
+ * This default is "sticky", being a part of the static state of all
* URLConnections. This flag applies to the next, and all following
- * URLConnections that are created.
+ * URLConnections that are created. This default value can be over-ridden
+ * per protocol using {@link #setDefaultUseCaches(String,boolean)}
*
* @return the default value of a {@code URLConnection}'s
* {@code useCaches} flag.
@@ -1046,7 +1061,8 @@
/**
* Sets the default value of the {@code useCaches} field to the
- * specified value.
+ * specified value. This default value can be over-ridden
+ * per protocol using {@link #setDefaultUseCaches(String,boolean)}
*
* @param defaultusecaches the new value.
* @see #getDefaultUseCaches()
@@ -1055,6 +1071,43 @@
defaultUseCaches = defaultusecaches;
}
+ /**
+ * Sets the default value of the {@code useCaches} field for the named
+ * protocol to the given value. This value overrides any default setting
+ * set by {@link #setDefaultUseCaches(boolean)} for the given protocol.
+ * Successive calls to this method change the setting and affect the
+ * default value for all future connections of that protocol. The protocol
+ * name is case insensitive.
+ *
+ * @param protocol the protocol to set the default for
+ * @param defaultVal whether caching is enabled by default for the given protocol
+ * @since 9
+ */
+ public static void setDefaultUseCaches(String protocol, boolean defaultVal) {
+ protocol = protocol.toLowerCase(Locale.US);
+ defaultCaching.put(protocol, defaultVal);
+ }
+
+ /**
+ * Returns the default value of the {@code useCaches} flag for the given protocol. If
+ * {@link #setDefaultUseCaches(String,boolean)} was called for the given protocol,
+ * then that value is returned. Otherwise, if {@link #setDefaultUseCaches(boolean)}
+ * was called, then that value is returned. If neither method was called,
+ * the return value is {@code true}. The protocol name is case insensitive.
+ *
+ * @param protocol the protocol whose defaultUseCaches setting is required
+ * @return the default value of the {@code useCaches} flag for the given protocol.
+ * @since 9
+ */
+ public static boolean getDefaultUseCaches(String protocol) {
+ Boolean protoDefault = defaultCaching.get(protocol.toLowerCase(Locale.US));
+ if (protoDefault != null) {
+ return protoDefault.booleanValue();
+ } else {
+ return defaultUseCaches;
+ }
+ }
+
/**
* Sets the general request property. If a property with the key already
* exists, overwrite its value with the new value.
diff -r be8643ebe865 -r 6665640c56cf jdk/src/java.base/share/classes/java/util/Collections.java
--- a/jdk/src/java.base/share/classes/java/util/Collections.java Fri Jan 13 01:36:02 2017 +0000
+++ b/jdk/src/java.base/share/classes/java/util/Collections.java Wed Jul 05 22:41:30 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
@@ -4354,6 +4354,11 @@
private Object readResolve() {
return EMPTY_SET;
}
+
+ @Override
+ public int hashCode() {
+ return 0;
+ }
}
/**
@@ -4786,6 +4791,10 @@
public boolean removeIf(Predicate filter) {
throw new UnsupportedOperationException();
}
+ @Override
+ public int hashCode() {
+ return Objects.hashCode(element);
+ }
}
/**
@@ -4848,6 +4857,10 @@
public Spliterator spliterator() {
return singletonSpliterator(element);
}
+ @Override
+ public int hashCode() {
+ return 31 + Objects.hashCode(element);
+ }
}
/**
@@ -4970,6 +4983,11 @@
BiFunction remappingFunction) {
throw new UnsupportedOperationException();
}
+
+ @Override
+ public int hashCode() {
+ return Objects.hashCode(k) ^ Objects.hashCode(v);
+ }
}
// Miscellaneous
diff -r be8643ebe865 -r 6665640c56cf jdk/src/java.base/share/classes/java/util/Date.java
--- a/jdk/src/java.base/share/classes/java/util/Date.java Fri Jan 13 01:36:02 2017 +0000
+++ b/jdk/src/java.base/share/classes/java/util/Date.java Wed Jul 05 22:41:30 2017 +0200
@@ -82,17 +82,19 @@
* well; for example, the time scale used by the satellite-based
* global positioning system (GPS) is synchronized to UTC but is
* not adjusted for leap seconds. An interesting source of
- * further information is the U.S. Naval Observatory, particularly
- * the Directorate of Time at:
+ * further information is the United States Naval Observatory (USNO):
*
- * http://www.usno.navy.mil
+ * http://www.usno.navy.mil/USNO
*
*
- * and their definitions of "Systems of Time" at:
+ * and the material regarding "Systems of Time" at:
*
* http://www.usno.navy.mil/USNO/time/master-clock/systems-of-time
*
*
+ * which has descriptions of various different time systems including
+ * UT, UT1, and UTC.
+ *
* In all methods of class {@code Date} that accept or return
* year, month, date, hours, minutes, and seconds values, the
* following representations are used:
diff -r be8643ebe865 -r 6665640c56cf jdk/src/java.base/share/classes/java/util/ImmutableCollections.java
--- a/jdk/src/java.base/share/classes/java/util/ImmutableCollections.java Fri Jan 13 01:36:02 2017 +0000
+++ b/jdk/src/java.base/share/classes/java/util/ImmutableCollections.java Wed Jul 05 22:41:30 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 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
@@ -35,6 +35,7 @@
import java.util.function.Function;
import java.util.function.Predicate;
import java.util.function.UnaryOperator;
+import jdk.internal.vm.annotation.Stable;
/**
* Container class for immutable collections. Not part of the public API.
@@ -105,6 +106,11 @@
return null; // but the compiler doesn't know this
}
+ @Override
+ public Iterator iterator() {
+ return Collections.emptyIterator();
+ }
+
private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
throw new InvalidObjectException("not serial proxy");
}
@@ -112,9 +118,26 @@
private Object writeReplace() {
return new CollSer(CollSer.IMM_LIST);
}
+
+ @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 int hashCode() {
+ return 1;
+ }
}
static final class List1 extends AbstractImmutableList {
+ @Stable
private final E e0;
List1(E e0) {
@@ -129,7 +152,6 @@
@Override
public E get(int index) {
Objects.checkIndex(index, 1);
- // assert index == 0
return e0;
}
@@ -140,10 +162,22 @@
private Object writeReplace() {
return new CollSer(CollSer.IMM_LIST, e0);
}
+
+ @Override
+ public boolean contains(Object o) {
+ return o.equals(e0); // implicit nullcheck of o
+ }
+
+ @Override
+ public int hashCode() {
+ return 31 + e0.hashCode();
+ }
}
static final class List2 extends AbstractImmutableList {
+ @Stable
private final E e0;
+ @Stable
private final E e1;
List2(E e0, E e1) {
@@ -166,6 +200,17 @@
}
}
+ @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();
+ }
+
private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
throw new InvalidObjectException("not serial proxy");
}
@@ -176,6 +221,7 @@
}
static final class ListN extends AbstractImmutableList {
+ @Stable
private final E[] elements;
@SafeVarargs
@@ -200,6 +246,25 @@
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");
}
@@ -238,7 +303,13 @@
@Override
public boolean contains(Object o) {
- return super.contains(Objects.requireNonNull(o));
+ Objects.requireNonNull(o);
+ return false;
+ }
+
+ @Override
+ public boolean containsAll(Collection o) {
+ return o.isEmpty(); // implicit nullcheck of o
}
@Override
@@ -253,9 +324,15 @@
private Object writeReplace() {
return new CollSer(CollSer.IMM_SET);
}
+
+ @Override
+ public int hashCode() {
+ return 0;
+ }
}
static final class Set1 extends AbstractImmutableSet {
+ @Stable
private final E e0;
Set1(E e0) {
@@ -269,7 +346,7 @@
@Override
public boolean contains(Object o) {
- return super.contains(Objects.requireNonNull(o));
+ return o.equals(e0); // implicit nullcheck of o
}
@Override
@@ -284,17 +361,21 @@
private Object writeReplace() {
return new CollSer(CollSer.IMM_SET, e0);
}
+
+ @Override
+ public int hashCode() {
+ return e0.hashCode();
+ }
}
static final class Set2 extends AbstractImmutableSet {
- private final E e0;
- private final E e1;
+ @Stable
+ final E e0;
+ @Stable
+ final E e1;
Set2(E e0, E e1) {
- Objects.requireNonNull(e0);
- Objects.requireNonNull(e1);
-
- if (e0.equals(e1)) {
+ if (e0.equals(Objects.requireNonNull(e1))) { // implicit nullcheck of e0
throw new IllegalArgumentException("duplicate element: " + e0);
}
@@ -314,7 +395,12 @@
@Override
public boolean contains(Object o) {
- return super.contains(Objects.requireNonNull(o));
+ return o.equals(e0) || o.equals(e1); // implicit nullcheck of o
+ }
+
+ @Override
+ public int hashCode() {
+ return e0.hashCode() + e1.hashCode();
}
@Override
@@ -358,8 +444,10 @@
* @param the element type
*/
static final class SetN extends AbstractImmutableSet {
- private final E[] elements;
- private final int size;
+ @Stable
+ final E[] elements;
+ @Stable
+ final int size;
@SafeVarargs
@SuppressWarnings("unchecked")
@@ -368,8 +456,8 @@
elements = (E[])new Object[EXPAND_FACTOR * input.length];
for (int i = 0; i < input.length; i++) {
- E e = Objects.requireNonNull(input[i]);
- int idx = probe(e);
+ E e = input[i];
+ int idx = probe(e); // implicit nullcheck of e
if (idx >= 0) {
throw new IllegalArgumentException("duplicate element: " + e);
} else {
@@ -385,8 +473,7 @@
@Override
public boolean contains(Object o) {
- Objects.requireNonNull(o);
- return probe(o) >= 0;
+ return probe(o) >= 0; // implicit nullcheck of o
}
@Override
@@ -414,8 +501,21 @@
};
}
+ @Override
+ public int hashCode() {
+ int h = 0;
+ for (E e : elements) {
+ if (e != null) {
+ h += e.hashCode();
+ }
+ }
+ return h;
+ }
+
// returns index at which element is present; or if absent,
- // (-i - 1) where i is location where element should be inserted
+ // (-i - 1) where i is location where element should be inserted.
+ // Callers are relying on this method to perform an implicit nullcheck
+ // of pe
private int probe(Object pe) {
int idx = Math.floorMod(pe.hashCode() ^ SALT, elements.length);
while (true) {
@@ -481,12 +581,14 @@
@Override
public boolean containsKey(Object o) {
- return super.containsKey(Objects.requireNonNull(o));
+ Objects.requireNonNull(o);
+ return false;
}
@Override
public boolean containsValue(Object o) {
- return super.containsValue(Objects.requireNonNull(o));
+ Objects.requireNonNull(o);
+ return false;
}
private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
@@ -496,10 +598,17 @@
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;
+ @Stable
private final V v0;
Map1(K k0, V v0) {
@@ -514,12 +623,12 @@
@Override
public boolean containsKey(Object o) {
- return super.containsKey(Objects.requireNonNull(o));
+ return o.equals(k0); // implicit nullcheck of o
}
@Override
public boolean containsValue(Object o) {
- return super.containsValue(Objects.requireNonNull(o));
+ return o.equals(v0); // implicit nullcheck of o
}
private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
@@ -529,6 +638,11 @@
private Object writeReplace() {
return new CollSer(CollSer.IMM_MAP, k0, v0);
}
+
+ @Override
+ public int hashCode() {
+ return k0.hashCode() ^ v0.hashCode();
+ }
}
/**
@@ -541,12 +655,13 @@
* @param the value type
*/
static final class MapN extends AbstractImmutableMap {
- private final Object[] table; // pairs of key, value
- private final int size; // number of pairs
+ @Stable
+ final Object[] table; // pairs of key, value
+ @Stable
+ final int size; // number of pairs
MapN(Object... input) {
- Objects.requireNonNull(input);
- if ((input.length & 1) != 0) {
+ if ((input.length & 1) != 0) { // implicit nullcheck of input
throw new InternalError("length is odd");
}
size = input.length >> 1;
@@ -573,12 +688,30 @@
@Override
public boolean containsKey(Object o) {
- return probe(Objects.requireNonNull(o)) >= 0;
+ return probe(o) >= 0; // implicit nullcheck of o
}
@Override
public boolean containsValue(Object o) {
- return super.containsValue(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
+ return true;
+ }
+ }
+ return false;
+ }
+
+ @Override
+ public int hashCode() {
+ int hash = 0;
+ for (int i = 0; i < table.length; i += 2) {
+ Object k = table[i];
+ if (k != null) {
+ hash += k.hashCode() ^ table[i + 1].hashCode();
+ }
+ }
+ return hash;
}
@Override
@@ -638,7 +771,9 @@
}
// returns index at which the probe key is present; or if absent,
- // (-i - 1) where i is location where element should be inserted
+ // (-i - 1) where i is location where element should be inserted.
+ // Callers are relying on this method to perform an implicit nullcheck
+ // of pk.
private int probe(Object pk) {
int idx = Math.floorMod(pk.hashCode() ^ SALT, table.length >> 1) << 1;
while (true) {
diff -r be8643ebe865 -r 6665640c56cf jdk/src/java.base/share/classes/java/util/KeyValueHolder.java
--- a/jdk/src/java.base/share/classes/java/util/KeyValueHolder.java Fri Jan 13 01:36:02 2017 +0000
+++ b/jdk/src/java.base/share/classes/java/util/KeyValueHolder.java Wed Jul 05 22:41:30 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 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
@@ -25,6 +25,8 @@
package java.util;
+import jdk.internal.vm.annotation.Stable;
+
/**
* An immutable container for a key and a value, suitable for use
* in creating and populating {@code Map} instances.
@@ -48,7 +50,9 @@
* @since 9
*/
final class KeyValueHolder implements Map.Entry {
+ @Stable
final K key;
+ @Stable
final V value;
KeyValueHolder(K k, V v) {
diff -r be8643ebe865 -r 6665640c56cf jdk/src/java.base/share/classes/java/util/List.java
--- a/jdk/src/java.base/share/classes/java/util/List.java Fri Jan 13 01:36:02 2017 +0000
+++ b/jdk/src/java.base/share/classes/java/util/List.java Wed Jul 05 22:41:30 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
@@ -1027,8 +1027,7 @@
@SafeVarargs
@SuppressWarnings("varargs")
static List of(E... elements) {
- Objects.requireNonNull(elements);
- switch (elements.length) {
+ switch (elements.length) { // implicit null check of elements
case 0:
return ImmutableCollections.List0.instance();
case 1:
diff -r be8643ebe865 -r 6665640c56cf jdk/src/java.base/share/classes/java/util/Map.java
--- a/jdk/src/java.base/share/classes/java/util/Map.java Fri Jan 13 01:36:02 2017 +0000
+++ b/jdk/src/java.base/share/classes/java/util/Map.java Wed Jul 05 22:41:30 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
@@ -1602,8 +1602,7 @@
@SafeVarargs
@SuppressWarnings("varargs")
static Map ofEntries(Entry... entries) {
- Objects.requireNonNull(entries);
- if (entries.length == 0) {
+ if (entries.length == 0) { // implicit null check of entries
return ImmutableCollections.Map0.instance();
} else if (entries.length == 1) {
return new ImmutableCollections.Map1<>(entries[0].getKey(),
diff -r be8643ebe865 -r 6665640c56cf jdk/src/java.base/share/classes/java/util/Set.java
--- a/jdk/src/java.base/share/classes/java/util/Set.java Fri Jan 13 01:36:02 2017 +0000
+++ b/jdk/src/java.base/share/classes/java/util/Set.java Wed Jul 05 22:41:30 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
@@ -689,8 +689,7 @@
@SafeVarargs
@SuppressWarnings("varargs")
static Set of(E... elements) {
- Objects.requireNonNull(elements);
- switch (elements.length) {
+ switch (elements.length) { // implicit null check of elements
case 0:
return ImmutableCollections.Set0.instance();
case 1:
diff -r be8643ebe865 -r 6665640c56cf jdk/src/java.base/share/classes/jdk/internal/module/ModuleHashesBuilder.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/java.base/share/classes/jdk/internal/module/ModuleHashesBuilder.java Wed Jul 05 22:41:30 2017 +0200
@@ -0,0 +1,312 @@
+/*
+ * Copyright (c) 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 jdk.internal.module;
+
+import java.io.PrintStream;
+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;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.Map;
+import java.util.Set;
+import java.util.function.Consumer;
+import java.util.function.Function;
+import java.util.stream.Stream;
+import static java.util.stream.Collectors.*;
+
+/**
+ * A Builder to compute ModuleHashes from a given configuration
+ */
+public class ModuleHashesBuilder {
+ private final Configuration configuration;
+ private final Set hashModuleCandidates;
+
+ /**
+ * Constructs a ModuleHashesBuilder that finds the packaged modules
+ * from the location of ModuleReference found from the given Configuration.
+ *
+ * @param config Configuration for building module hashes
+ * @param modules the candidate modules to be hashed
+ */
+ public ModuleHashesBuilder(Configuration config, Set modules) {
+ this.configuration = config;
+ this.hashModuleCandidates = modules;
+ }
+
+ /**
+ * Returns a map of a module M to ModuleHashes for the modules
+ * that depend upon M directly or indirectly.
+ *
+ * The key for each entry in the returned map is a module M that has
+ * no outgoing edges to any of the candidate modules to be hashed
+ * i.e. M is a leaf node in a connected subgraph containing M and
+ * other candidate modules from the module graph filtering
+ * the outgoing edges from M to non-candidate modules.
+ */
+ public Map computeHashes(Set roots) {
+ // build a graph containing the the packaged modules and
+ // its transitive dependences matching --hash-modules
+ Graph.Builder builder = new Graph.Builder<>();
+ Deque deque = new ArrayDeque<>(configuration.modules());
+ Set visited = new HashSet<>();
+ while (!deque.isEmpty()) {
+ ResolvedModule rm = deque.pop();
+ if (!visited.contains(rm)) {
+ visited.add(rm);
+ builder.addNode(rm.name());
+ for (ResolvedModule dm : rm.reads()) {
+ if (!visited.contains(dm)) {
+ deque.push(dm);
+ }
+ builder.addEdge(rm.name(), dm.name());
+ }
+ }
+ }
+
+ // each node in a transposed graph is a matching packaged module
+ // in which the hash of the modules that depend upon it is recorded
+ Graph transposedGraph = builder.build().transpose();
+
+ // traverse the modules in topological order that will identify
+ // the modules to record the hashes - it is the first matching
+ // module and has not been hashed during the traversal.
+ Set mods = new HashSet<>();
+ Map hashes = new HashMap<>();
+ builder.build()
+ .orderedNodes()
+ .filter(mn -> roots.contains(mn) && !mods.contains(mn))
+ .forEach(mn -> {
+ // Compute hashes of the modules that depend on mn directly and
+ // indirectly excluding itself.
+ Set ns = transposedGraph.dfs(mn)
+ .stream()
+ .filter(n -> !n.equals(mn) && hashModuleCandidates.contains(n))
+ .collect(toSet());
+ mods.add(mn);
+ mods.addAll(ns);
+
+ if (!ns.isEmpty()) {
+ Map moduleToPath = ns.stream()
+ .collect(toMap(Function.identity(), this::moduleToPath));
+ hashes.put(mn, ModuleHashes.generate(moduleToPath, "SHA-256"));
+ }
+ });
+ return hashes;
+ }
+
+ private Path moduleToPath(String name) {
+ ResolvedModule rm = configuration.findModule(name).orElseThrow(
+ () -> new InternalError("Selected module " + name + " not on module path"));
+
+ URI uri = rm.reference().location().get();
+ Path path = Paths.get(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");
+ }
+ return path;
+ }
+
+ /*
+ * Utilty class
+ */
+ static class Graph {
+ private final Set nodes;
+ private final Map> edges;
+
+ public Graph(Set nodes, Map> edges) {
+ this.nodes = Collections.unmodifiableSet(nodes);
+ this.edges = Collections.unmodifiableMap(edges);
+ }
+
+ public Set nodes() {
+ return nodes;
+ }
+
+ public Map> edges() {
+ return edges;
+ }
+
+ public Set adjacentNodes(T u) {
+ return edges.get(u);
+ }
+
+ public boolean contains(T u) {
+ return nodes.contains(u);
+ }
+
+ /**
+ * Returns nodes sorted in topological order.
+ */
+ public Stream orderedNodes() {
+ TopoSorter sorter = new TopoSorter<>(this);
+ return sorter.result.stream();
+ }
+
+ /**
+ * Traverse this graph and performs the given action in topological order
+ */
+ public void ordered(Consumer action) {
+ TopoSorter sorter = new TopoSorter<>(this);
+ sorter.ordered(action);
+ }
+
+ /**
+ * Traverses this graph and performs the given action in reverse topological order
+ */
+ public void reverse(Consumer action) {
+ TopoSorter sorter = new TopoSorter<>(this);
+ sorter.reverse(action);
+ }
+
+ /**
+ * Returns a transposed graph from this graph
+ */
+ public Graph transpose() {
+ Builder builder = new Builder<>();
+ nodes.stream().forEach(builder::addNode);
+ // reverse edges
+ edges.keySet().forEach(u -> {
+ edges.get(u).stream()
+ .forEach(v -> builder.addEdge(v, u));
+ });
+ return builder.build();
+ }
+
+ /**
+ * Returns all nodes reachable from the given root.
+ */
+ public Set dfs(T root) {
+ return dfs(Set.of(root));
+ }
+
+ /**
+ * Returns all nodes reachable from the given set of roots.
+ */
+ public Set dfs(Set roots) {
+ Deque deque = new LinkedList<>(roots);
+ Set visited = new HashSet<>();
+ while (!deque.isEmpty()) {
+ T u = deque.pop();
+ if (!visited.contains(u)) {
+ visited.add(u);
+ if (contains(u)) {
+ adjacentNodes(u).stream()
+ .filter(v -> !visited.contains(v))
+ .forEach(deque::push);
+ }
+ }
+ }
+ return visited;
+ }
+
+ public void printGraph(PrintStream out) {
+ out.println("graph for " + nodes);
+ nodes.stream()
+ .forEach(u -> adjacentNodes(u).stream()
+ .forEach(v -> out.format(" %s -> %s%n", u, v)));
+ }
+
+ static class Builder {
+ final Set nodes = new HashSet<>();
+ final Map> edges = new HashMap<>();
+
+ public void addNode(T node) {
+ if (nodes.contains(node)) {
+ return;
+ }
+ nodes.add(node);
+ edges.computeIfAbsent(node, _e -> new HashSet<>());
+ }
+
+ public void addEdge(T u, T v) {
+ addNode(u);
+ addNode(v);
+ edges.get(u).add(v);
+ }
+
+ public Graph build() {
+ return new Graph(nodes, edges);
+ }
+ }
+ }
+
+ /**
+ * Topological sort
+ */
+ private static class TopoSorter {
+ final Deque result = new LinkedList<>();
+ final Deque nodes;
+ final Graph graph;
+
+ TopoSorter(Graph graph) {
+ this.graph = graph;
+ this.nodes = new LinkedList<>(graph.nodes);
+ sort();
+ }
+
+ public void ordered(Consumer action) {
+ result.iterator().forEachRemaining(action);
+ }
+
+ public void reverse(Consumer action) {
+ result.descendingIterator().forEachRemaining(action);
+ }
+
+ private void sort() {
+ Deque visited = new LinkedList<>();
+ Deque done = new LinkedList<>();
+ T node;
+ while ((node = nodes.poll()) != null) {
+ if (!visited.contains(node)) {
+ visit(node, visited, done);
+ }
+ }
+ }
+
+ private void visit(T node, Deque visited, Deque done) {
+ if (visited.contains(node)) {
+ if (!done.contains(node)) {
+ throw new IllegalArgumentException("Cyclic detected: " +
+ node + " " + graph.edges().get(node));
+ }
+ return;
+ }
+ visited.add(node);
+ graph.edges().get(node).stream()
+ .forEach(x -> visit(x, visited, done));
+ done.add(node);
+ result.addLast(node);
+ }
+ }
+}
diff -r be8643ebe865 -r 6665640c56cf jdk/src/java.base/share/native/libnet/net_util.c
--- a/jdk/src/java.base/share/native/libnet/net_util.c Fri Jan 13 01:36:02 2017 +0000
+++ b/jdk/src/java.base/share/native/libnet/net_util.c Wed Jul 05 22:41:30 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2016, Oracle and/or its affiliates. All rights reserved.
+ * 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
@@ -64,10 +64,10 @@
preferIPv4Stack = (*env)->CallStaticBooleanMethod(env, iCls, mid, s);
/*
- Since we have initialized and loaded the Socket library we will
- check now to whether we have IPv6 on this platform and if the
- supporting socket APIs are available
- */
+ * Since we have initialized and loaded the socket library we will
+ * check now whether we have IPv6 on this platform and if the
+ * supporting socket APIs are available
+ */
IPv6_available = IPv6_supported() & (!preferIPv4Stack);
/* check if SO_REUSEPORT is supported on this platform */
@@ -120,16 +120,16 @@
return JNI_TRUE;
}
-int getInet6Address_scopeid_set(JNIEnv *env, jobject iaObj) {
+jboolean getInet6Address_scopeid_set(JNIEnv *env, jobject iaObj) {
jobject holder = (*env)->GetObjectField(env, iaObj, ia6_holder6ID);
- CHECK_NULL_RETURN(holder, -1);
+ CHECK_NULL_RETURN(holder, JNI_FALSE);
return (*env)->GetBooleanField(env, holder, ia6_scopeidsetID);
}
-int getInet6Address_scopeid(JNIEnv *env, jobject iaObj) {
+unsigned int getInet6Address_scopeid(JNIEnv *env, jobject iaObj) {
jobject holder = (*env)->GetObjectField(env, iaObj, ia6_holder6ID);
- CHECK_NULL_RETURN(holder, -1);
- return (*env)->GetIntField(env, holder, ia6_scopeidID);
+ CHECK_NULL_RETURN(holder, 0);
+ return (unsigned int)(*env)->GetIntField(env, holder, ia6_scopeidID);
}
jboolean setInet6Address_scopeid(JNIEnv *env, jobject iaObj, int scopeid) {
@@ -201,11 +201,10 @@
}
JNIEXPORT jobject JNICALL
-NET_SockaddrToInetAddress(JNIEnv *env, struct sockaddr *him, int *port) {
+NET_SockaddrToInetAddress(JNIEnv *env, SOCKETADDRESS *sa, int *port) {
jobject iaObj;
- if (him->sa_family == AF_INET6) {
- struct sockaddr_in6 *him6 = (struct sockaddr_in6 *)him;
- jbyte *caddr = (jbyte *)&(him6->sin6_addr);
+ if (sa->sa.sa_family == AF_INET6) {
+ jbyte *caddr = (jbyte *)&sa->sa6.sin6_addr;
if (NET_IsIPv4Mapped(caddr)) {
int address;
iaObj = (*env)->NewObject(env, ia4_class, ia4_ctrID);
@@ -214,42 +213,35 @@
setInetAddress_addr(env, iaObj, address);
setInetAddress_family(env, iaObj, java_net_InetAddress_IPv4);
} else {
- jint scope;
jboolean ret;
iaObj = (*env)->NewObject(env, ia6_class, ia6_ctrID);
CHECK_NULL_RETURN(iaObj, NULL);
- ret = setInet6Address_ipaddress(env, iaObj, (char *)&(him6->sin6_addr));
+ ret = setInet6Address_ipaddress(env, iaObj, (char *)&sa->sa6.sin6_addr);
if (ret == JNI_FALSE)
return NULL;
setInetAddress_family(env, iaObj, java_net_InetAddress_IPv6);
- scope = getScopeID(him);
- setInet6Address_scopeid(env, iaObj, scope);
+ setInet6Address_scopeid(env, iaObj, sa->sa6.sin6_scope_id);
}
- *port = ntohs(him6->sin6_port);
+ *port = ntohs(sa->sa6.sin6_port);
} else {
- struct sockaddr_in *him4 = (struct sockaddr_in *)him;
iaObj = (*env)->NewObject(env, ia4_class, ia4_ctrID);
CHECK_NULL_RETURN(iaObj, NULL);
setInetAddress_family(env, iaObj, java_net_InetAddress_IPv4);
- setInetAddress_addr(env, iaObj, ntohl(him4->sin_addr.s_addr));
- *port = ntohs(him4->sin_port);
+ setInetAddress_addr(env, iaObj, ntohl(sa->sa4.sin_addr.s_addr));
+ *port = ntohs(sa->sa4.sin_port);
}
return iaObj;
}
-JNIEXPORT jint JNICALL
-NET_SockaddrEqualsInetAddress(JNIEnv *env, struct sockaddr *him, jobject iaObj)
+JNIEXPORT jboolean JNICALL
+NET_SockaddrEqualsInetAddress(JNIEnv *env, SOCKETADDRESS *sa, jobject iaObj)
{
- jint family = AF_INET;
-
- family = getInetAddress_family(env, iaObj) == java_net_InetAddress_IPv4 ?
- AF_INET : AF_INET6;
- if (him->sa_family == AF_INET6) {
- struct sockaddr_in6 *him6 = (struct sockaddr_in6 *)him;
- jbyte *caddrNew = (jbyte *)&(him6->sin6_addr);
+ jint family = getInetAddress_family(env, iaObj) ==
+ java_net_InetAddress_IPv4 ? AF_INET : AF_INET6;
+ if (sa->sa.sa_family == AF_INET6) {
+ jbyte *caddrNew = (jbyte *)&sa->sa6.sin6_addr;
if (NET_IsIPv4Mapped(caddrNew)) {
- int addrNew;
- int addrCur;
+ int addrNew, addrCur;
if (family == AF_INET6) {
return JNI_FALSE;
}
@@ -262,26 +254,24 @@
}
} else {
jbyte caddrCur[16];
- int scope;
-
if (family == AF_INET) {
return JNI_FALSE;
}
- scope = getInet6Address_scopeid(env, iaObj);
getInet6Address_ipaddress(env, iaObj, (char *)caddrCur);
- if (NET_IsEqual(caddrNew, caddrCur) && cmpScopeID(scope, him)) {
+ if (NET_IsEqual(caddrNew, caddrCur) &&
+ sa->sa6.sin6_scope_id == getInet6Address_scopeid(env, iaObj))
+ {
return JNI_TRUE;
} else {
return JNI_FALSE;
}
}
} else {
- struct sockaddr_in *him4 = (struct sockaddr_in *)him;
int addrNew, addrCur;
if (family != AF_INET) {
return JNI_FALSE;
}
- addrNew = ntohl(him4->sin_addr.s_addr);
+ addrNew = ntohl(sa->sa4.sin_addr.s_addr);
addrCur = getInetAddress_addr(env, iaObj);
if (addrNew == addrCur) {
return JNI_TRUE;
@@ -291,6 +281,15 @@
}
}
+JNIEXPORT jint JNICALL
+NET_GetPortFromSockaddr(SOCKETADDRESS *sa) {
+ if (sa->sa.sa_family == AF_INET6) {
+ return ntohs(sa->sa6.sin6_port);
+ } else {
+ return ntohs(sa->sa4.sin_port);
+ }
+}
+
unsigned short
in_cksum(unsigned short *addr, int len) {
int nleft = len;
diff -r be8643ebe865 -r 6665640c56cf jdk/src/java.base/share/native/libnet/net_util.h
--- a/jdk/src/java.base/share/native/libnet/net_util.h Fri Jan 13 01:36:02 2017 +0000
+++ b/jdk/src/java.base/share/native/libnet/net_util.h Wed Jul 05 22:41:30 2017 +0200
@@ -63,8 +63,8 @@
*/
extern jobject getInet6Address_scopeifname(JNIEnv *env, jobject ia6Obj);
extern jboolean setInet6Address_scopeifname(JNIEnv *env, jobject ia6Obj, jobject scopeifname);
-extern int getInet6Address_scopeid_set(JNIEnv *env, jobject ia6Obj);
-extern int getInet6Address_scopeid(JNIEnv *env, jobject ia6Obj);
+extern jboolean getInet6Address_scopeid_set(JNIEnv *env, jobject ia6Obj);
+extern unsigned int getInet6Address_scopeid(JNIEnv *env, jobject ia6Obj);
extern jboolean setInet6Address_scopeid(JNIEnv *env, jobject ia6Obj, int scopeid);
extern jboolean getInet6Address_ipaddress(JNIEnv *env, jobject ia6Obj, char *dest);
extern jboolean setInet6Address_ipaddress(JNIEnv *env, jobject ia6Obj, char *address);
@@ -132,24 +132,41 @@
JNIEXPORT jint JNICALL reuseport_available();
+/**
+ * This function will fill a SOCKETADDRESS structure from an InetAddress
+ * object.
+ *
+ * The parameter 'sa' must point to valid storage of size
+ * 'sizeof(SOCKETADDRESS)'.
+ *
+ * The parameter 'len' is a pointer to an int and is used for returning
+ * the actual sockaddr length, e.g. 'sizeof(struct sockaddr_in)' or
+ * 'sizeof(struct sockaddr_in6)'.
+ *
+ * If the type of the InetAddress object is IPv6, the function will fill a
+ * sockaddr_in6 structure. IPv6 must be available in that case, otherwise an
+ * exception is thrown.
+ * In the case of an IPv4 InetAddress, when IPv6 is available and
+ * v4MappedAddress is TRUE, this method will fill a sockaddr_in6 structure
+ * containing an IPv4 mapped IPv6 address. Otherwise a sockaddr_in
+ * structure will be filled.
+ */
JNIEXPORT int JNICALL
NET_InetAddressToSockaddr(JNIEnv *env, jobject iaObj, int port,
- struct sockaddr *him, int *len,
+ SOCKETADDRESS *sa, int *len,
jboolean v4MappedAddress);
JNIEXPORT jobject JNICALL
-NET_SockaddrToInetAddress(JNIEnv *env, struct sockaddr *him, int *port);
+NET_SockaddrToInetAddress(JNIEnv *env, SOCKETADDRESS *sa, int *port);
void platformInit();
void parseExclusiveBindProperty(JNIEnv *env);
-void NET_SetTrafficClass(struct sockaddr *him, int trafficClass);
+JNIEXPORT jint JNICALL NET_GetPortFromSockaddr(SOCKETADDRESS *sa);
-JNIEXPORT jint JNICALL NET_GetPortFromSockaddr(struct sockaddr *him);
-
-JNIEXPORT jint JNICALL
-NET_SockaddrEqualsInetAddress(JNIEnv *env,struct sockaddr *him, jobject iaObj);
+JNIEXPORT jboolean JNICALL
+NET_SockaddrEqualsInetAddress(JNIEnv *env, SOCKETADDRESS *sa, jobject iaObj);
int NET_IsIPv4Mapped(jbyte* caddr);
@@ -172,7 +189,7 @@
NET_SetSockOpt(int fd, int level, int opt, const void *arg, int len);
JNIEXPORT int JNICALL
-NET_Bind(int fd, struct sockaddr *him, int len);
+NET_Bind(int fd, SOCKETADDRESS *sa, int len);
JNIEXPORT int JNICALL
NET_MapSocketOption(jint cmd, int *level, int *optname);
@@ -183,10 +200,6 @@
JNIEXPORT jint JNICALL
NET_EnableFastTcpLoopback(int fd);
-int getScopeID(struct sockaddr *);
-
-int cmpScopeID(unsigned int, struct sockaddr *);
-
unsigned short in_cksum(unsigned short *addr, int len);
jint NET_Wait(JNIEnv *env, jint fd, jint flags, jint timeout);
diff -r be8643ebe865 -r 6665640c56cf jdk/src/java.base/unix/native/libnet/Inet6AddressImpl.c
--- a/jdk/src/java.base/unix/native/libnet/Inet6AddressImpl.c Fri Jan 13 01:36:02 2017 +0000
+++ b/jdk/src/java.base/unix/native/libnet/Inet6AddressImpl.c Wed Jul 05 22:41:30 2017 +0200
@@ -211,7 +211,8 @@
{
int port;
int index = (family == AF_INET) ? i++ : j++;
- jobject o = NET_SockaddrToInetAddress(env, iter->ifa_addr, &port);
+ jobject o = NET_SockaddrToInetAddress(env,
+ (SOCKETADDRESS *)iter->ifa_addr, &port);
if (!o) {
freeifaddrs(ifa);
if (!(*env)->ExceptionCheck(env))
diff -r be8643ebe865 -r 6665640c56cf jdk/src/java.base/unix/native/libnet/NetworkInterface.c
--- a/jdk/src/java.base/unix/native/libnet/NetworkInterface.c Fri Jan 13 01:36:02 2017 +0000
+++ b/jdk/src/java.base/unix/native/libnet/NetworkInterface.c Wed Jul 05 22:41:30 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 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
@@ -791,7 +791,7 @@
int sock;
sock = openSocket(env, AF_INET);
- if (sock < 0 && (*env)->ExceptionOccurred(env)) {
+ if (sock < 0) {
return NULL;
}
@@ -809,7 +809,7 @@
// so we have to call ipv6_available()
if (ipv6_available()) {
sock = openSocket(env, AF_INET6);
- if (sock < 0 && (*env)->ExceptionOccurred(env)) {
+ if (sock < 0) {
freeif(ifs);
return NULL;
}
diff -r be8643ebe865 -r 6665640c56cf jdk/src/java.base/unix/native/libnet/PlainDatagramSocketImpl.c
--- a/jdk/src/java.base/unix/native/libnet/PlainDatagramSocketImpl.c Fri Jan 13 01:36:02 2017 +0000
+++ b/jdk/src/java.base/unix/native/libnet/PlainDatagramSocketImpl.c Wed Jul 05 22:41:30 2017 +0200
@@ -99,7 +99,7 @@
CHECK_NULL_RETURN(i_class, NULL);
}
- return ( (*env)->NewObject(env, i_class, i_ctrID, i) );
+ return (*env)->NewObject(env, i_class, i_ctrID, i);
}
/*
@@ -118,10 +118,9 @@
CHECK_NULL_RETURN(b_class, NULL);
}
- return( (*env)->NewObject(env, b_class, b_ctrID, (jboolean)(b!=0)) );
+ return (*env)->NewObject(env, b_class, b_ctrID, (jboolean)(b != 0));
}
-
/*
* Returns the fd for a PlainDatagramSocketImpl or -1
* if closed.
@@ -134,7 +133,6 @@
return (*env)->GetIntField(env, fdObj, IO_fd_fdID);
}
-
/*
* Class: java_net_PlainDatagramSocketImpl
* Method: init
@@ -166,7 +164,6 @@
initInetAddressIDs(env);
JNU_CHECK_EXCEPTION(env);
Java_java_net_NetworkInterface_init(env, 0);
-
}
/*
@@ -176,13 +173,13 @@
*/
JNIEXPORT void JNICALL
Java_java_net_PlainDatagramSocketImpl_bind0(JNIEnv *env, jobject this,
- jint localport, jobject iaObj) {
+ jint localport, jobject iaObj) {
/* fdObj is the FileDescriptor field on this */
jobject fdObj = (*env)->GetObjectField(env, this, pdsi_fdID);
/* fd is an int field on fdObj */
int fd;
int len = 0;
- SOCKETADDRESS him;
+ SOCKETADDRESS sa;
socklen_t slen = sizeof(SOCKETADDRESS);
if (IS_NULL(fdObj)) {
@@ -199,12 +196,13 @@
}
/* bind */
- if (NET_InetAddressToSockaddr(env, iaObj, localport, &him.sa, &len, JNI_TRUE) != 0) {
+ if (NET_InetAddressToSockaddr(env, iaObj, localport, &sa, &len,
+ JNI_TRUE) != 0) {
return;
}
- setDefaultScopeID(env, &him.sa);
+ setDefaultScopeID(env, &sa.sa);
- if (NET_Bind(fd, &him.sa, len) < 0) {
+ if (NET_Bind(fd, &sa, len) < 0) {
if (errno == EADDRINUSE || errno == EADDRNOTAVAIL ||
errno == EPERM || errno == EACCES) {
NET_ThrowByNameWithLastError(env, JNU_JAVANETPKG "BindException",
@@ -221,13 +219,13 @@
/* Now that we're a connected socket, let's extract the port number
* that the system chose for us and store it in the Socket object.
*/
- if (getsockname(fd, &him.sa, &slen) == -1) {
+ if (getsockname(fd, &sa.sa, &slen) == -1) {
JNU_ThrowByNameWithMessageAndLastError
(env, JNU_JAVANETPKG "SocketException", "Error getting socket name");
return;
}
- localport = NET_GetPortFromSockaddr(&him.sa);
+ localport = NET_GetPortFromSockaddr(&sa);
(*env)->SetIntField(env, this, pdsi_localPortID, localport);
} else {
@@ -263,7 +261,8 @@
return;
}
- if (NET_InetAddressToSockaddr(env, address, port, &rmtaddr.sa, &len, JNI_TRUE) != 0) {
+ if (NET_InetAddressToSockaddr(env, address, port, &rmtaddr, &len,
+ JNI_TRUE) != 0) {
return;
}
@@ -290,6 +289,9 @@
#if defined(__linux__) || defined(_ALLBSD_SOURCE)
SOCKETADDRESS addr;
socklen_t len;
+#if defined(__linux__)
+ int localPort = 0;
+#endif
#endif
if (IS_NULL(fdObj)) {
@@ -298,32 +300,31 @@
fd = (*env)->GetIntField(env, fdObj, IO_fd_fdID);
#if defined(__linux__) || defined(_ALLBSD_SOURCE)
- memset(&addr, 0, sizeof(addr));
- if (ipv6_available()) {
- addr.sa6.sin6_family = AF_UNSPEC;
- len = sizeof(struct sockaddr_in6);
- } else {
- addr.sa4.sin_family = AF_UNSPEC;
- len = sizeof(struct sockaddr_in);
- }
- NET_Connect(fd, &addr.sa, len);
+ memset(&addr, 0, sizeof(addr));
+ if (ipv6_available()) {
+ addr.sa6.sin6_family = AF_UNSPEC;
+ len = sizeof(struct sockaddr_in6);
+ } else {
+ addr.sa4.sin_family = AF_UNSPEC;
+ len = sizeof(struct sockaddr_in);
+ }
+ NET_Connect(fd, &addr.sa, len);
-#ifdef __linux__
- int localPort = 0;
- if (getsockname(fd, &addr.sa, &len) == -1)
- return;
+#if defined(__linux__)
+ if (getsockname(fd, &addr.sa, &len) == -1)
+ return;
- localPort = NET_GetPortFromSockaddr(&addr.sa);
- if (localPort == 0) {
- localPort = (*env)->GetIntField(env, this, pdsi_localPortID);
- if (addr.sa.sa_family == AF_INET6) {
- addr.sa6.sin6_port = htons(localPort);
- } else {
- addr.sa4.sin_port = htons(localPort);
- }
+ localPort = NET_GetPortFromSockaddr(&addr);
+ if (localPort == 0) {
+ localPort = (*env)->GetIntField(env, this, pdsi_localPortID);
+ if (addr.sa.sa_family == AF_INET6) {
+ addr.sa6.sin6_port = htons(localPort);
+ } else {
+ addr.sa4.sin_port = htons(localPort);
+ }
- NET_Bind(fd, &addr.sa, len);
- }
+ NET_Bind(fd, &addr, len);
+ }
#endif
#else
@@ -355,8 +356,9 @@
/* The fdObj'fd */
jint fd;
- SOCKETADDRESS rmtaddr, *rmtaddrP = &rmtaddr;
- int len;
+ SOCKETADDRESS rmtaddr;
+ struct sockaddr *rmtaddrP = 0;
+ int len = 0;
if (IS_NULL(fdObj)) {
JNU_ThrowByName(env, JNU_JAVANETPKG "SocketException",
@@ -382,15 +384,14 @@
packetBufferOffset = (*env)->GetIntField(env, packet, dp_offsetID);
packetBufferLen = (*env)->GetIntField(env, packet, dp_lengthID);
- if (connected) {
- /* arg to NET_Sendto () null in this case */
- len = 0;
- rmtaddrP = 0;
- } else {
+ // arg to NET_Sendto() null, if connected
+ if (!connected) {
packetPort = (*env)->GetIntField(env, packet, dp_portID);
- if (NET_InetAddressToSockaddr(env, packetAddress, packetPort, &rmtaddr.sa, &len, JNI_TRUE) != 0) {
+ if (NET_InetAddressToSockaddr(env, packetAddress, packetPort, &rmtaddr,
+ &len, JNI_TRUE) != 0) {
return;
}
+ rmtaddrP = &rmtaddr.sa;
}
setDefaultScopeID(env, &rmtaddr.sa);
@@ -427,7 +428,7 @@
(*env)->GetByteArrayRegion(env, packetBuffer, packetBufferOffset, packetBufferLen,
(jbyte *)fullPacket);
if (trafficClass != 0 && ipv6_available()) {
- NET_SetTrafficClass(&rmtaddr.sa, trafficClass);
+ NET_SetTrafficClass(&rmtaddr, trafficClass);
}
/*
@@ -437,8 +438,7 @@
* ECONNREFUSED indicating that an ICMP port unreachable has
* received.
*/
- ret = NET_SendTo(fd, fullPacket, packetBufferLen, 0,
- (struct sockaddr *)rmtaddrP, len);
+ ret = NET_SendTo(fd, fullPacket, packetBufferLen, 0, rmtaddrP, len);
if (ret < 0) {
if (errno == ECONNREFUSED) {
@@ -510,7 +510,7 @@
#ifdef __solaris__
if (errno == ECONNREFUSED) {
int orig_errno = errno;
- (void) recv(fd, buf, 1, 0);
+ recv(fd, buf, 1, 0);
errno = orig_errno;
}
#endif
@@ -528,7 +528,7 @@
return 0;
}
- iaObj = NET_SockaddrToInetAddress(env, &rmtaddr.sa, &port);
+ iaObj = NET_SockaddrToInetAddress(env, &rmtaddr, &port);
family = getInetAddress_family(env, iaObj) == java_net_InetAddress_IPv4 ?
AF_INET : AF_INET6;
if (family == AF_INET) { /* this API can't handle IPV6 addresses */
@@ -676,18 +676,18 @@
*/
packetAddress = (*env)->GetObjectField(env, packet, dp_addressID);
if (packetAddress != NULL) {
- if (!NET_SockaddrEqualsInetAddress(env, &rmtaddr.sa, packetAddress)) {
+ if (!NET_SockaddrEqualsInetAddress(env, &rmtaddr, packetAddress)) {
/* force a new InetAddress to be created */
packetAddress = NULL;
}
}
if (packetAddress == NULL) {
- packetAddress = NET_SockaddrToInetAddress(env, &rmtaddr.sa, &port);
+ packetAddress = NET_SockaddrToInetAddress(env, &rmtaddr, &port);
/* stuff the new Inetaddress in the packet */
(*env)->SetObjectField(env, packet, dp_addressID, packetAddress);
} else {
/* only get the new port number */
- port = NET_GetPortFromSockaddr(&rmtaddr.sa);
+ port = NET_GetPortFromSockaddr(&rmtaddr);
}
/* and fill in the data, remote address/port and such */
(*env)->SetByteArrayRegion(env, packetBuffer, packetBufferOffset, n,
@@ -857,18 +857,19 @@
*/
packetAddress = (*env)->GetObjectField(env, packet, dp_addressID);
if (packetAddress != NULL) {
- if (!NET_SockaddrEqualsInetAddress(env, &rmtaddr.sa, packetAddress)) {
+ if (!NET_SockaddrEqualsInetAddress(env, &rmtaddr,
+ packetAddress)) {
/* force a new InetAddress to be created */
packetAddress = NULL;
}
}
if (packetAddress == NULL) {
- packetAddress = NET_SockaddrToInetAddress(env, &rmtaddr.sa, &port);
+ packetAddress = NET_SockaddrToInetAddress(env, &rmtaddr, &port);
/* stuff the new Inetaddress in the packet */
(*env)->SetObjectField(env, packet, dp_addressID, packetAddress);
} else {
/* only get the new port number */
- port = NET_GetPortFromSockaddr(&rmtaddr.sa);
+ port = NET_GetPortFromSockaddr(&rmtaddr);
}
/* and fill in the data, remote address/port and such */
(*env)->SetByteArrayRegion(env, packetBuffer, packetBufferOffset, n,
@@ -1040,6 +1041,7 @@
/*
* We need an ipv4 address here
*/
+ in.s_addr = 0;
for (i = 0; i < len; i++) {
addr = (*env)->GetObjectArrayElement(env, addrArray, i);
if (getInetAddress_family(env, addr) == java_net_InetAddress_IPv4) {
@@ -1049,7 +1051,7 @@
}
if (setsockopt(fd, IPPROTO_IP, IP_MULTICAST_IF,
- (const char*)&in, sizeof(in)) < 0) {
+ (const char *)&in, sizeof(in)) < 0) {
JNU_ThrowByNameWithMessageAndLastError
(env, JNU_JAVANETPKG "SocketException", "Error setting socket option");
}
@@ -1670,17 +1672,17 @@
*/
if (opt == java_net_SocketOptions_SO_BINDADDR) {
/* find out local IP address */
- SOCKETADDRESS him;
+ SOCKETADDRESS sa;
socklen_t len = sizeof(SOCKETADDRESS);
int port;
jobject iaObj;
- if (getsockname(fd, &him.sa, &len) == -1) {
+ if (getsockname(fd, &sa.sa, &len) == -1) {
JNU_ThrowByNameWithMessageAndLastError
(env, JNU_JAVANETPKG "SocketException", "Error getting socket name");
return NULL;
}
- iaObj = NET_SockaddrToInetAddress(env, &him.sa, &port);
+ iaObj = NET_SockaddrToInetAddress(env, &sa, &port);
return iaObj;
}
@@ -1969,6 +1971,7 @@
mname.imr_multiaddr.s_addr = htonl(getInetAddress_addr(env, iaObj));
#ifdef __linux__
mname.imr_address.s_addr = htonl(getInetAddress_addr(env, addr));
+ mname.imr_ifindex = 0;
#else
mname.imr_interface.s_addr = htonl(getInetAddress_addr(env, addr));
#endif
@@ -2023,7 +2026,7 @@
#ifdef __linux__
mname.imr_address.s_addr = in.s_addr;
-
+ mname.imr_ifindex = 0;
#else
mname.imr_interface.s_addr = in.s_addr;
#endif
diff -r be8643ebe865 -r 6665640c56cf jdk/src/java.base/unix/native/libnet/PlainSocketImpl.c
--- a/jdk/src/java.base/unix/native/libnet/PlainSocketImpl.c Fri Jan 13 01:36:02 2017 +0000
+++ b/jdk/src/java.base/unix/native/libnet/PlainSocketImpl.c Wed Jul 05 22:41:30 2017 +0200
@@ -244,7 +244,7 @@
/* fd is an int field on iaObj */
jint fd;
- SOCKETADDRESS him;
+ SOCKETADDRESS sa;
/* The result of the connection */
int connect_rv = -1;
@@ -260,17 +260,18 @@
}
/* connect */
- if (NET_InetAddressToSockaddr(env, iaObj, port, &him.sa, &len, JNI_TRUE) != 0) {
+ if (NET_InetAddressToSockaddr(env, iaObj, port, &sa, &len,
+ JNI_TRUE) != 0) {
return;
}
- setDefaultScopeID(env, &him.sa);
+ setDefaultScopeID(env, &sa.sa);
if (trafficClass != 0 && ipv6_available()) {
- NET_SetTrafficClass(&him.sa, trafficClass);
+ NET_SetTrafficClass(&sa, trafficClass);
}
if (timeout <= 0) {
- connect_rv = NET_Connect(fd, &him.sa, len);
+ connect_rv = NET_Connect(fd, &sa.sa, len);
#ifdef __solaris__
if (connect_rv == -1 && errno == EINPROGRESS ) {
@@ -319,7 +320,7 @@
SET_NONBLOCKING(fd);
/* no need to use NET_Connect as non-blocking */
- connect_rv = connect(fd, &him.sa, len);
+ connect_rv = connect(fd, &sa.sa, len);
/* connection not established immediately */
if (connect_rv != 0) {
@@ -467,11 +468,11 @@
* that the system chose for us and store it in the Socket object.
*/
socklen_t slen = sizeof(SOCKETADDRESS);
- if (getsockname(fd, &him.sa, &slen) == -1) {
+ if (getsockname(fd, &sa.sa, &slen) == -1) {
JNU_ThrowByNameWithMessageAndLastError
(env, JNU_JAVANETPKG "SocketException", "Error getting socket name");
} else {
- localport = NET_GetPortFromSockaddr(&him.sa);
+ localport = NET_GetPortFromSockaddr(&sa);
(*env)->SetIntField(env, this, psi_localportID, localport);
}
}
@@ -490,8 +491,8 @@
jobject fdObj = (*env)->GetObjectField(env, this, psi_fdID);
/* fd is an int field on fdObj */
int fd;
- int len;
- SOCKETADDRESS him;
+ int len = 0;
+ SOCKETADDRESS sa;
if (IS_NULL(fdObj)) {
JNU_ThrowByName(env, JNU_JAVANETPKG "SocketException",
@@ -506,13 +507,13 @@
}
/* bind */
- if (NET_InetAddressToSockaddr(env, iaObj, localport, &him.sa,
+ if (NET_InetAddressToSockaddr(env, iaObj, localport, &sa,
&len, JNI_TRUE) != 0) {
return;
}
- setDefaultScopeID(env, &him.sa);
+ setDefaultScopeID(env, &sa.sa);
- if (NET_Bind(fd, &him.sa, len) < 0) {
+ if (NET_Bind(fd, &sa, len) < 0) {
if (errno == EADDRINUSE || errno == EADDRNOTAVAIL ||
errno == EPERM || errno == EACCES) {
NET_ThrowByNameWithLastError(env, JNU_JAVANETPKG "BindException",
@@ -533,12 +534,12 @@
/* Now that we're a connected socket, let's extract the port number
* that the system chose for us and store it in the Socket object.
*/
- if (getsockname(fd, &him.sa, &slen) == -1) {
+ if (getsockname(fd, &sa.sa, &slen) == -1) {
JNU_ThrowByNameWithMessageAndLastError
(env, JNU_JAVANETPKG "SocketException", "Error getting socket name");
return;
}
- localport = NET_GetPortFromSockaddr(&him.sa);
+ localport = NET_GetPortFromSockaddr(&sa);
(*env)->SetIntField(env, this, psi_localportID, localport);
} else {
(*env)->SetIntField(env, this, psi_localportID, localport);
@@ -606,7 +607,7 @@
/* accepted fd */
jint newfd;
- SOCKETADDRESS him;
+ SOCKETADDRESS sa;
socklen_t slen = sizeof(SOCKETADDRESS);
if (IS_NULL(fdObj)) {
@@ -661,7 +662,7 @@
return;
}
- newfd = NET_Accept(fd, &him.sa, &slen);
+ newfd = NET_Accept(fd, &sa.sa, &slen);
/* connection accepted */
if (newfd >= 0) {
@@ -709,7 +710,7 @@
/*
* fill up the remote peer port and address in the new socket structure.
*/
- socketAddressObj = NET_SockaddrToInetAddress(env, &him.sa, &port);
+ socketAddressObj = NET_SockaddrToInetAddress(env, &sa, &port);
if (socketAddressObj == NULL) {
/* should be pending exception */
close(newfd);
@@ -944,19 +945,19 @@
* SO_BINDADDR isn't a socket option
*/
if (cmd == java_net_SocketOptions_SO_BINDADDR) {
- SOCKETADDRESS him;
+ SOCKETADDRESS sa;
socklen_t len = sizeof(SOCKETADDRESS);
int port;
jobject iaObj;
jclass iaCntrClass;
jfieldID iaFieldID;
- if (getsockname(fd, &him.sa, &len) < 0) {
+ if (getsockname(fd, &sa.sa, &len) < 0) {
JNU_ThrowByNameWithMessageAndLastError
(env, JNU_JAVANETPKG "SocketException", "Error getting socket name");
return -1;
}
- iaObj = NET_SockaddrToInetAddress(env, &him.sa, &port);
+ iaObj = NET_SockaddrToInetAddress(env, &sa, &port);
CHECK_NULL_RETURN(iaObj, -1);
iaCntrClass = (*env)->GetObjectClass(env, iaContainerObj);
diff -r be8643ebe865 -r 6665640c56cf jdk/src/java.base/unix/native/libnet/net_util_md.c
--- a/jdk/src/java.base/unix/native/libnet/net_util_md.c Fri Jan 13 01:36:02 2017 +0000
+++ b/jdk/src/java.base/unix/native/libnet/net_util_md.c Wed Jul 05 22:41:30 2017 +0200
@@ -234,29 +234,6 @@
}
return kernelV24;
}
-
-int getScopeID (struct sockaddr *him) {
- struct sockaddr_in6 *hext = (struct sockaddr_in6 *)him;
- return hext->sin6_scope_id;
-}
-
-int cmpScopeID (unsigned int scope, struct sockaddr *him) {
- struct sockaddr_in6 *hext = (struct sockaddr_in6 *)him;
- return hext->sin6_scope_id == scope;
-}
-
-#else
-
-int getScopeID (struct sockaddr *him) {
- struct sockaddr_in6 *him6 = (struct sockaddr_in6 *)him;
- return him6->sin6_scope_id;
-}
-
-int cmpScopeID (unsigned int scope, struct sockaddr *him) {
- struct sockaddr_in6 *him6 = (struct sockaddr_in6 *)him;
- return him6->sin6_scope_id == scope;
-}
-
#endif
void
@@ -775,30 +752,32 @@
return 0;
}
-/* In the case of an IPv4 Inetaddress this method will return an
- * IPv4 mapped address where IPv6 is available and v4MappedAddress is TRUE.
- * Otherwise it will return a sockaddr_in structure for an IPv4 InetAddress.
-*/
+/**
+ * See net_util.h for documentation
+ */
JNIEXPORT int JNICALL
-NET_InetAddressToSockaddr(JNIEnv *env, jobject iaObj, int port, struct sockaddr *him,
- int *len, jboolean v4MappedAddress) {
- jint family;
- family = getInetAddress_family(env, iaObj);
- /* needs work. 1. family 2. clean up him6 etc deallocate memory */
- if (ipv6_available() && !(family == java_net_InetAddress_IPv4 &&
- v4MappedAddress == JNI_FALSE)) {
- struct sockaddr_in6 *him6 = (struct sockaddr_in6 *)him;
+NET_InetAddressToSockaddr(JNIEnv *env, jobject iaObj, int port,
+ SOCKETADDRESS *sa, int *len,
+ jboolean v4MappedAddress)
+{
+ jint family = getInetAddress_family(env, iaObj);
+ memset((char *)sa, 0, sizeof(SOCKETADDRESS));
+
+ if (ipv6_available() &&
+ !(family == java_net_InetAddress_IPv4 &&
+ v4MappedAddress == JNI_FALSE))
+ {
jbyte caddr[16];
jint address;
if (family == java_net_InetAddress_IPv4) {
// convert to IPv4-mapped address
- memset((char *) caddr, 0, 16);
+ memset((char *)caddr, 0, 16);
address = getInetAddress_addr(env, iaObj);
if (address == INADDR_ANY) {
/* we would always prefer IPv6 wildcard address
- caddr[10] = 0xff;
- caddr[11] = 0xff; */
+ * caddr[10] = 0xff;
+ * caddr[11] = 0xff; */
} else {
caddr[10] = 0xff;
caddr[11] = 0xff;
@@ -810,22 +789,19 @@
} else {
getInet6Address_ipaddress(env, iaObj, (char *)caddr);
}
- memset((char *)him6, 0, sizeof(struct sockaddr_in6));
- him6->sin6_port = htons(port);
- memcpy((void *)&(him6->sin6_addr), caddr, sizeof(struct in6_addr) );
- him6->sin6_family = AF_INET6;
- *len = sizeof(struct sockaddr_in6);
+ sa->sa6.sin6_port = htons(port);
+ memcpy((void *)&sa->sa6.sin6_addr, caddr, sizeof(struct in6_addr));
+ sa->sa6.sin6_family = AF_INET6;
+ if (len != NULL) {
+ *len = sizeof(struct sockaddr_in6);
+ }
-#if defined(_ALLBSD_SOURCE)
-// XXXBSD: should we do something with scope id here ? see below linux comment
-/* MMM: Come back to this! */
-#endif
-
+#ifdef __linux__
/*
* On Linux if we are connecting to a link-local address
* we need to specify the interface in the scope_id (2.4 kernel only)
*
- * If the scope was cached the we use the cached value. If not cached but
+ * If the scope was cached then we use the cached value. If not cached but
* specified in the Inet6Address we use that, but we first check if the
* address needs to be routed via the loopback interface. In this case,
* we override the specified value with that of the loopback interface.
@@ -833,9 +809,8 @@
* we try to determine a value from the routing table. In all these
* cases the used value is cached for further use.
*/
-#ifdef __linux__
- if (IN6_IS_ADDR_LINKLOCAL(&(him6->sin6_addr))) {
- int cached_scope_id = 0, scope_id = 0;
+ if (IN6_IS_ADDR_LINKLOCAL(&sa->sa6.sin6_addr)) {
+ unsigned int cached_scope_id = 0, scope_id = 0;
if (ia6_cachedscopeidID) {
cached_scope_id = (int)(*env)->GetIntField(env, iaObj, ia6_cachedscopeidID);
@@ -850,7 +825,7 @@
/* check user-specified value for loopback case
* that needs to be overridden
*/
- if (kernelIsV24() && needsLoopbackRoute (&him6->sin6_addr)) {
+ if (kernelIsV24() && needsLoopbackRoute(&sa->sa6.sin6_addr)) {
cached_scope_id = lo_scope_id;
(*env)->SetIntField(env, iaObj, ia6_cachedscopeidID, cached_scope_id);
}
@@ -860,11 +835,11 @@
* try determine the appropriate interface.
*/
if (kernelIsV24()) {
- cached_scope_id = getDefaultIPv6Interface(&(him6->sin6_addr));
+ cached_scope_id = getDefaultIPv6Interface(&sa->sa6.sin6_addr);
} else {
- cached_scope_id = getLocalScopeID((char *)&(him6->sin6_addr));
+ cached_scope_id = getLocalScopeID((char *)&(sa->sa6.sin6_addr));
if (cached_scope_id == 0) {
- cached_scope_id = getDefaultIPv6Interface(&(him6->sin6_addr));
+ cached_scope_id = getDefaultIPv6Interface(&sa->sa6.sin6_addr);
}
}
(*env)->SetIntField(env, iaObj, ia6_cachedscopeidID, cached_scope_id);
@@ -876,53 +851,37 @@
* If we have a scope_id use the extended form
* of sockaddr_in6.
*/
-
- struct sockaddr_in6 *him6 =
- (struct sockaddr_in6 *)him;
- him6->sin6_scope_id = cached_scope_id != 0 ?
- cached_scope_id : scope_id;
- *len = sizeof(struct sockaddr_in6);
+ sa->sa6.sin6_scope_id = cached_scope_id == 0 ? scope_id : cached_scope_id;
}
#else
- /* handle scope_id for solaris */
-
+ /* handle scope_id */
if (family != java_net_InetAddress_IPv4) {
if (ia6_scopeidID) {
- him6->sin6_scope_id = getInet6Address_scopeid(env, iaObj);
+ sa->sa6.sin6_scope_id = getInet6Address_scopeid(env, iaObj);
}
}
#endif
} else {
- struct sockaddr_in *him4 = (struct sockaddr_in *)him;
jint address;
- if (family == java_net_InetAddress_IPv6) {
+ if (family != java_net_InetAddress_IPv4) {
JNU_ThrowByName(env, JNU_JAVANETPKG "SocketException", "Protocol family unavailable");
return -1;
}
- memset((char *)him4, 0, sizeof(struct sockaddr_in));
address = getInetAddress_addr(env, iaObj);
- him4->sin_port = htons((short) port);
- him4->sin_addr.s_addr = htonl(address);
- him4->sin_family = AF_INET;
- *len = sizeof(struct sockaddr_in);
+ sa->sa4.sin_port = htons(port);
+ sa->sa4.sin_addr.s_addr = htonl(address);
+ sa->sa4.sin_family = AF_INET;
+ if (len != NULL) {
+ *len = sizeof(struct sockaddr_in);
+ }
}
return 0;
}
void
-NET_SetTrafficClass(struct sockaddr *him, int trafficClass) {
- if (him->sa_family == AF_INET6) {
- struct sockaddr_in6 *him6 = (struct sockaddr_in6 *)him;
- him6->sin6_flowinfo = htonl((trafficClass & 0xff) << 20);
- }
-}
-
-JNIEXPORT jint JNICALL
-NET_GetPortFromSockaddr(struct sockaddr *him) {
- if (him->sa_family == AF_INET6) {
- return ntohs(((struct sockaddr_in6*)him)->sin6_port);
- } else {
- return ntohs(((struct sockaddr_in*)him)->sin_port);
+NET_SetTrafficClass(SOCKETADDRESS *sa, int trafficClass) {
+ if (sa->sa.sa_family == AF_INET6) {
+ sa->sa6.sin6_flowinfo = htonl((trafficClass & 0xff) << 20);
}
}
@@ -1488,7 +1447,7 @@
*
*/
int
-NET_Bind(int fd, struct sockaddr *him, int len)
+NET_Bind(int fd, SOCKETADDRESS *sa, int len)
{
#if defined(__solaris__)
int level = -1;
@@ -1503,9 +1462,8 @@
* ## When IPv6 is enabled this will be an IPv4-mapped
* ## with family set to AF_INET6
*/
- if (him->sa_family == AF_INET) {
- struct sockaddr_in *sa = (struct sockaddr_in *)him;
- if ((ntohl(sa->sin_addr.s_addr) & 0x7f0000ff) == 0x7f0000ff) {
+ if (sa->sa.sa_family == AF_INET) {
+ if ((ntohl(sa->sa4.sin_addr.s_addr) & 0x7f0000ff) == 0x7f0000ff) {
errno = EADDRNOTAVAIL;
return -1;
}
@@ -1524,8 +1482,9 @@
*/
alen = sizeof(arg);
- if (useExclBind || getsockopt(fd, SOL_SOCKET, SO_REUSEADDR,
- (char *)&arg, &alen) == 0) {
+ if (useExclBind ||
+ getsockopt(fd, SOL_SOCKET, SO_REUSEADDR, (char *)&arg, &alen) == 0)
+ {
if (useExclBind || arg == 0) {
/*
* SO_REUSEADDR is disabled or sun.net.useExclusiveBind
@@ -1533,8 +1492,8 @@
* UDP_EXCLBIND
*/
alen = sizeof(arg);
- if (getsockopt(fd, SOL_SOCKET, SO_TYPE, (char *)&arg,
- &alen) == 0) {
+ if (getsockopt(fd, SOL_SOCKET, SO_TYPE, (char *)&arg, &alen) == 0)
+ {
if (arg == SOCK_STREAM) {
level = IPPROTO_TCP;
exclbind = TCP_EXCLBIND;
@@ -1545,14 +1504,13 @@
}
arg = 1;
- setsockopt(fd, level, exclbind, (char *)&arg,
- sizeof(arg));
+ setsockopt(fd, level, exclbind, (char *)&arg, sizeof(arg));
}
}
#endif
- rv = bind(fd, him, len);
+ rv = bind(fd, &sa->sa, len);
#if defined(__solaris__)
if (rv < 0) {
diff -r be8643ebe865 -r 6665640c56cf jdk/src/java.base/unix/native/libnet/net_util_md.h
--- a/jdk/src/java.base/unix/native/libnet/net_util_md.h Fri Jan 13 01:36:02 2017 +0000
+++ b/jdk/src/java.base/unix/native/libnet/net_util_md.h Wed Jul 05 22:41:30 2017 +0200
@@ -30,32 +30,6 @@
#include
#include
-int NET_Timeout(int s, long timeout);
-int NET_Timeout0(int s, long timeout, long currentTime);
-int NET_Read(int s, void* buf, size_t len);
-int NET_NonBlockingRead(int s, void* buf, size_t len);
-int NET_TimeoutWithCurrentTime(int s, long timeout, long currentTime);
-long NET_GetCurrentTime();
-int NET_RecvFrom(int s, void *buf, int len, unsigned int flags,
- struct sockaddr *from, socklen_t *fromlen);
-int NET_ReadV(int s, const struct iovec * vector, int count);
-int NET_Send(int s, void *msg, int len, unsigned int flags);
-int NET_SendTo(int s, const void *msg, int len, unsigned int
- flags, const struct sockaddr *to, int tolen);
-int NET_Writev(int s, const struct iovec * vector, int count);
-int NET_Connect(int s, struct sockaddr *addr, int addrlen);
-int NET_Accept(int s, struct sockaddr *addr, socklen_t *addrlen);
-int NET_SocketClose(int s);
-int NET_Dup2(int oldfd, int newfd);
-int NET_Poll(struct pollfd *ufds, unsigned int nfds, int timeout);
-int NET_SocketAvailable(int s, jint *pbytes);
-
-void NET_ThrowUnknownHostExceptionWithGaiError(JNIEnv *env,
- const char* hostname,
- int gai_error);
-void NET_ThrowByNameWithLastError(JNIEnv *env, const char *name,
- const char *defaultDetail);
-
/************************************************************************
* Macros and constants
*/
@@ -91,9 +65,36 @@
} SOCKETADDRESS;
/************************************************************************
- * Utilities
+ * Functions
*/
+int NET_Timeout(int s, long timeout);
+int NET_Timeout0(int s, long timeout, long currentTime);
+int NET_Read(int s, void* buf, size_t len);
+int NET_NonBlockingRead(int s, void* buf, size_t len);
+int NET_TimeoutWithCurrentTime(int s, long timeout, long currentTime);
+long NET_GetCurrentTime();
+int NET_RecvFrom(int s, void *buf, int len, unsigned int flags,
+ struct sockaddr *from, socklen_t *fromlen);
+int NET_ReadV(int s, const struct iovec * vector, int count);
+int NET_Send(int s, void *msg, int len, unsigned int flags);
+int NET_SendTo(int s, const void *msg, int len, unsigned int
+ flags, const struct sockaddr *to, int tolen);
+int NET_Writev(int s, const struct iovec * vector, int count);
+int NET_Connect(int s, struct sockaddr *addr, int addrlen);
+int NET_Accept(int s, struct sockaddr *addr, socklen_t *addrlen);
+int NET_SocketClose(int s);
+int NET_Dup2(int oldfd, int newfd);
+int NET_Poll(struct pollfd *ufds, unsigned int nfds, int timeout);
+int NET_SocketAvailable(int s, jint *pbytes);
+
+void NET_ThrowUnknownHostExceptionWithGaiError(JNIEnv *env,
+ const char* hostname,
+ int gai_error);
+void NET_ThrowByNameWithLastError(JNIEnv *env, const char *name,
+ const char *defaultDetail);
+void NET_SetTrafficClass(SOCKETADDRESS *sa, int trafficClass);
+
#ifdef __linux__
int kernelIsV24();
int getDefaultIPv6Interface(struct in6_addr *target_addr);
diff -r be8643ebe865 -r 6665640c56cf jdk/src/java.base/unix/native/libnio/ch/DatagramChannelImpl.c
--- a/jdk/src/java.base/unix/native/libnio/ch/DatagramChannelImpl.c Fri Jan 13 01:36:02 2017 +0000
+++ b/jdk/src/java.base/unix/native/libnio/ch/DatagramChannelImpl.c Wed Jul 05 22:41:30 2017 +0200
@@ -181,11 +181,11 @@
*/
senderAddr = (*env)->GetObjectField(env, this, dci_senderAddrID);
if (senderAddr != NULL) {
- if (!NET_SockaddrEqualsInetAddress(env, &sa.sa, senderAddr)) {
+ if (!NET_SockaddrEqualsInetAddress(env, &sa, senderAddr)) {
senderAddr = NULL;
} else {
jint port = (*env)->GetIntField(env, this, dci_senderPortID);
- if (port != NET_GetPortFromSockaddr(&sa.sa)) {
+ if (port != NET_GetPortFromSockaddr(&sa)) {
senderAddr = NULL;
}
}
@@ -193,7 +193,7 @@
if (senderAddr == NULL) {
jobject isa = NULL;
int port = 0;
- jobject ia = NET_SockaddrToInetAddress(env, &sa.sa, &port);
+ jobject ia = NET_SockaddrToInetAddress(env, &sa, &port);
if (ia != NULL) {
isa = (*env)->NewObject(env, isa_class, isa_ctorID, ia, port);
}
@@ -201,7 +201,7 @@
(*env)->SetObjectField(env, this, dci_senderAddrID, ia);
(*env)->SetIntField(env, this, dci_senderPortID,
- NET_GetPortFromSockaddr(&sa.sa));
+ NET_GetPortFromSockaddr(&sa));
(*env)->SetObjectField(env, this, dci_senderID, isa);
}
return n;
@@ -215,14 +215,14 @@
jint fd = fdval(env, fdo);
void *buf = (void *)jlong_to_ptr(address);
SOCKETADDRESS sa;
- int sa_len = sizeof(SOCKETADDRESS);
+ int sa_len = 0;
jint n = 0;
if (len > MAX_PACKET_LEN) {
len = MAX_PACKET_LEN;
}
- if (NET_InetAddressToSockaddr(env, destAddress, destPort, &sa.sa,
+ if (NET_InetAddressToSockaddr(env, destAddress, destPort, &sa,
&sa_len, preferIPv6) != 0) {
return IOS_THROWN;
}
diff -r be8643ebe865 -r 6665640c56cf jdk/src/java.base/unix/native/libnio/ch/InheritedChannel.c
--- a/jdk/src/java.base/unix/native/libnio/ch/InheritedChannel.c Fri Jan 13 01:36:02 2017 +0000
+++ b/jdk/src/java.base/unix/native/libnio/ch/InheritedChannel.c Wed Jul 05 22:41:30 2017 +0200
@@ -64,7 +64,7 @@
if (getpeername(fd, &sa.sa, &len) == 0) {
if (matchFamily(&sa.sa)) {
- remote_ia = NET_SockaddrToInetAddress(env, &sa.sa, (int *)&remote_port);
+ remote_ia = NET_SockaddrToInetAddress(env, &sa, (int *)&remote_port);
}
}
@@ -81,7 +81,7 @@
if (getpeername(fd, &sa.sa, &len) == 0) {
if (matchFamily(&sa.sa)) {
- NET_SockaddrToInetAddress(env, &sa.sa, (int *)&remote_port);
+ NET_SockaddrToInetAddress(env, &sa, (int *)&remote_port);
}
}
diff -r be8643ebe865 -r 6665640c56cf jdk/src/java.base/unix/native/libnio/ch/Net.c
--- a/jdk/src/java.base/unix/native/libnio/ch/Net.c Fri Jan 13 01:36:02 2017 +0000
+++ b/jdk/src/java.base/unix/native/libnio/ch/Net.c Wed Jul 05 22:41:30 2017 +0200
@@ -274,15 +274,15 @@
jboolean useExclBind, jobject iao, int port)
{
SOCKETADDRESS sa;
- int sa_len = sizeof(SOCKETADDRESS);
+ int sa_len = 0;
int rv = 0;
- if (NET_InetAddressToSockaddr(env, iao, port, &sa.sa, &sa_len,
+ if (NET_InetAddressToSockaddr(env, iao, port, &sa, &sa_len,
preferIPv6) != 0) {
return;
}
- rv = NET_Bind(fdval(env, fdo), &sa.sa, sa_len);
+ rv = NET_Bind(fdval(env, fdo), &sa, sa_len);
if (rv != 0) {
handleSocketError(env, errno);
}
@@ -300,10 +300,10 @@
jobject fdo, jobject iao, jint port)
{
SOCKETADDRESS sa;
- int sa_len = sizeof(SOCKETADDRESS);
+ int sa_len = 0;
int rv;
- if (NET_InetAddressToSockaddr(env, iao, port, &sa.sa, &sa_len,
+ if (NET_InetAddressToSockaddr(env, iao, port, &sa, &sa_len,
preferIPv6) != 0) {
return IOS_THROWN;
}
@@ -349,7 +349,7 @@
return -1;
#endif /* _ALLBSD_SOURCE */
}
- return NET_GetPortFromSockaddr(&sa.sa);
+ return NET_GetPortFromSockaddr(&sa);
}
JNIEXPORT jobject JNICALL
@@ -382,7 +382,7 @@
return NULL;
#endif /* _ALLBSD_SOURCE */
}
- return NET_SockaddrToInetAddress(env, &sa.sa, &port);
+ return NET_SockaddrToInetAddress(env, &sa, &port);
}
JNIEXPORT jint JNICALL
diff -r be8643ebe865 -r 6665640c56cf jdk/src/java.base/unix/native/libnio/ch/ServerSocketChannelImpl.c
--- a/jdk/src/java.base/unix/native/libnio/ch/ServerSocketChannelImpl.c Fri Jan 13 01:36:02 2017 +0000
+++ b/jdk/src/java.base/unix/native/libnio/ch/ServerSocketChannelImpl.c Wed Jul 05 22:41:30 2017 +0200
@@ -112,7 +112,7 @@
}
(*env)->SetIntField(env, newfdo, fd_fdID, newfd);
- remote_ia = NET_SockaddrToInetAddress(env, &sa.sa, (int *)&remote_port);
+ remote_ia = NET_SockaddrToInetAddress(env, &sa, (int *)&remote_port);
CHECK_NULL_RETURN(remote_ia, IOS_THROWN);
isa = (*env)->NewObject(env, isa_class, isa_ctorID, remote_ia, remote_port);
CHECK_NULL_RETURN(isa, IOS_THROWN);
diff -r be8643ebe865 -r 6665640c56cf jdk/src/java.base/windows/classes/java/io/WinNTFileSystem.java
--- a/jdk/src/java.base/windows/classes/java/io/WinNTFileSystem.java Fri Jan 13 01:36:02 2017 +0000
+++ b/jdk/src/java.base/windows/classes/java/io/WinNTFileSystem.java Wed Jul 05 22:41:30 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 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
@@ -233,11 +233,14 @@
int childStart = 0;
int parentEnd = pn;
+ boolean isDirectoryRelative =
+ pn == 2 && isLetter(parent.charAt(0)) && parent.charAt(1) == ':';
+
if ((cn > 1) && (c.charAt(0) == slash)) {
if (c.charAt(1) == slash) {
/* Drop prefix when child is a UNC pathname */
childStart = 2;
- } else {
+ } else if (!isDirectoryRelative) {
/* Drop prefix when child is drive-relative */
childStart = 1;
@@ -254,7 +257,7 @@
int strlen = parentEnd + cn - childStart;
char[] theChars = null;
- if (child.charAt(childStart) == slash) {
+ if (child.charAt(childStart) == slash || isDirectoryRelative) {
theChars = new char[strlen];
parent.getChars(0, parentEnd, theChars, 0);
child.getChars(childStart, cn, theChars, parentEnd);
diff -r be8643ebe865 -r 6665640c56cf jdk/src/java.base/windows/native/libnet/DualStackPlainDatagramSocketImpl.c
--- a/jdk/src/java.base/windows/native/libnet/DualStackPlainDatagramSocketImpl.c Fri Jan 13 01:36:02 2017 +0000
+++ b/jdk/src/java.base/windows/native/libnet/DualStackPlainDatagramSocketImpl.c Wed Jul 05 22:41:30 2017 +0200
@@ -53,7 +53,7 @@
break;
}
if (recvfrom(fd, buf, 1, MSG_PEEK,
- (struct sockaddr *)&rmtaddr, &addrlen) != SOCKET_ERROR) {
+ &rmtaddr.sa, &addrlen) != SOCKET_ERROR) {
break;
}
if (WSAGetLastError() != WSAECONNRESET) {
@@ -61,7 +61,7 @@
break;
}
- recvfrom(fd, buf, 1, 0, (struct sockaddr *)&rmtaddr, &addrlen);
+ recvfrom(fd, buf, 1, 0, &rmtaddr.sa, &addrlen);
got_icmp = JNI_TRUE;
}
@@ -134,14 +134,13 @@
JNIEXPORT void JNICALL Java_java_net_DualStackPlainDatagramSocketImpl_socketBind
(JNIEnv *env, jclass clazz, jint fd, jobject iaObj, jint port, jboolean exclBind) {
SOCKETADDRESS sa;
- int rv;
- int sa_len = sizeof(sa);
+ int rv, sa_len = 0;
- if (NET_InetAddressToSockaddr(env, iaObj, port, (struct sockaddr *)&sa,
+ if (NET_InetAddressToSockaddr(env, iaObj, port, &sa,
&sa_len, JNI_TRUE) != 0) {
return;
}
- rv = NET_WinBind(fd, (struct sockaddr *)&sa, sa_len, exclBind);
+ rv = NET_WinBind(fd, &sa, sa_len, exclBind);
if (rv == SOCKET_ERROR) {
if (WSAGetLastError() == WSAEACCES) {
@@ -159,17 +158,15 @@
JNIEXPORT void JNICALL Java_java_net_DualStackPlainDatagramSocketImpl_socketConnect
(JNIEnv *env, jclass clazz, jint fd, jobject iaObj, jint port) {
SOCKETADDRESS sa;
- int rv;
- int sa_len = sizeof(sa);
+ int rv, sa_len = 0, t = TRUE;
DWORD x1, x2; /* ignored result codes */
- int t = TRUE;
- if (NET_InetAddressToSockaddr(env, iaObj, port, (struct sockaddr *)&sa,
+ if (NET_InetAddressToSockaddr(env, iaObj, port, &sa,
&sa_len, JNI_TRUE) != 0) {
return;
}
- rv = connect(fd, (struct sockaddr *)&sa, sa_len);
+ rv = connect(fd, &sa.sa, sa_len);
if (rv == SOCKET_ERROR) {
NET_ThrowNew(env, WSAGetLastError(), "connect");
return;
@@ -192,7 +189,7 @@
int t = FALSE;
memset(&sa, 0, sa_len);
- connect(fd, (struct sockaddr *)&sa, sa_len);
+ connect(fd, &sa.sa, sa_len);
/* see comment in socketCreate */
WSAIoctl(fd, SIO_UDP_CONNRESET, &t, sizeof(t), &x1, sizeof(x1), &x2, 0, 0);
@@ -219,7 +216,7 @@
SOCKETADDRESS sa;
int len = sizeof(sa);
- if (getsockname(fd, (struct sockaddr *)&sa, &len) == SOCKET_ERROR) {
+ if (getsockname(fd, &sa.sa, &len) == SOCKET_ERROR) {
NET_ThrowNew(env, WSAGetLastError(), "getsockname");
return -1;
}
@@ -238,12 +235,12 @@
jobject iaObj;
int port;
- if (getsockname(fd, (struct sockaddr *)&sa, &len) == SOCKET_ERROR) {
+ if (getsockname(fd, &sa.sa, &len) == SOCKET_ERROR) {
NET_ThrowNew(env, WSAGetLastError(), "Error getting socket name");
return NULL;
}
- iaObj = NET_SockaddrToInetAddress(env, (struct sockaddr *)&sa, &port);
+ iaObj = NET_SockaddrToInetAddress(env, &sa, &port);
return iaObj;
}
@@ -316,7 +313,7 @@
/* receive the packet */
rv = recvfrom(fd, fullPacket, packetBufferLen, flags,
- (struct sockaddr *)&sa, &sa_len);
+ &sa.sa, &sa_len);
if (rv == SOCKET_ERROR && (WSAGetLastError() == WSAECONNRESET)) {
/* An icmp port unreachable - we must receive this as Windows
@@ -383,15 +380,13 @@
*/
packetAddress = (*env)->GetObjectField(env, dpObj, dp_addressID);
if (packetAddress != NULL) {
- if (!NET_SockaddrEqualsInetAddress(env, (struct sockaddr *)&sa,
- packetAddress)) {
+ if (!NET_SockaddrEqualsInetAddress(env, &sa, packetAddress)) {
/* force a new InetAddress to be created */
packetAddress = NULL;
}
}
if (packetAddress == NULL) {
- packetAddress = NET_SockaddrToInetAddress(env, (struct sockaddr *)&sa,
- &port);
+ packetAddress = NET_SockaddrToInetAddress(env, &sa, &port);
if (packetAddress != NULL) {
/* stuff the new Inetaddress into the packet */
(*env)->SetObjectField(env, dpObj, dp_addressID, packetAddress);
@@ -422,20 +417,18 @@
(JNIEnv *env, jclass clazz, jint fd, jbyteArray data, jint offset, jint length,
jobject iaObj, jint port, jboolean connected) {
SOCKETADDRESS sa;
- int sa_len = sizeof(sa);
- SOCKETADDRESS *sap = &sa;
+ int rv, sa_len = 0;
+ struct sockaddr *sap = 0;
char BUF[MAX_BUFFER_LEN];
char *fullPacket;
- int rv;
- if (connected) {
- sap = 0; /* arg to sendto () null in this case */
- sa_len = 0;
- } else {
- if (NET_InetAddressToSockaddr(env, iaObj, port, (struct sockaddr *)&sa,
- &sa_len, JNI_TRUE) != 0) {
+ // if already connected, sap arg to sendto() is null
+ if (!connected) {
+ if (NET_InetAddressToSockaddr(env, iaObj, port, &sa,
+ &sa_len, JNI_TRUE) != 0) {
return;
}
+ sap = &sa.sa;
}
if (length > MAX_BUFFER_LEN) {
@@ -456,7 +449,7 @@
(*env)->GetByteArrayRegion(env, data, offset, length,
(jbyte *)fullPacket);
- rv = sendto(fd, fullPacket, length, 0, (struct sockaddr *)sap, sa_len);
+ rv = sendto(fd, fullPacket, length, 0, sap, sa_len);
if (rv == SOCKET_ERROR) {
if (rv == -1) {
NET_ThrowNew(env, WSAGetLastError(), "Datagram send failed");
diff -r be8643ebe865 -r 6665640c56cf jdk/src/java.base/windows/native/libnet/DualStackPlainSocketImpl.c
--- a/jdk/src/java.base/windows/native/libnet/DualStackPlainSocketImpl.c Fri Jan 13 01:36:02 2017 +0000
+++ b/jdk/src/java.base/windows/native/libnet/DualStackPlainSocketImpl.c Wed Jul 05 22:41:30 2017 +0200
@@ -89,15 +89,14 @@
jboolean exclBind)
{
SOCKETADDRESS sa;
- int rv;
- int sa_len = sizeof(sa);
+ int rv, sa_len = 0;
- if (NET_InetAddressToSockaddr(env, iaObj, port, (struct sockaddr *)&sa,
- &sa_len, JNI_TRUE) != 0) {
+ if (NET_InetAddressToSockaddr(env, iaObj, port, &sa,
+ &sa_len, JNI_TRUE) != 0) {
return;
}
- rv = NET_WinBind(fd, (struct sockaddr *)&sa, sa_len, exclBind);
+ rv = NET_WinBind(fd, &sa, sa_len, exclBind);
if (rv == SOCKET_ERROR)
NET_ThrowNew(env, WSAGetLastError(), "NET_Bind");
@@ -111,15 +110,14 @@
JNIEXPORT jint JNICALL Java_java_net_DualStackPlainSocketImpl_connect0
(JNIEnv *env, jclass clazz, jint fd, jobject iaObj, jint port) {
SOCKETADDRESS sa;
- int rv;
- int sa_len = sizeof(sa);
+ int rv, sa_len = 0;
- if (NET_InetAddressToSockaddr(env, iaObj, port, (struct sockaddr *)&sa,
- &sa_len, JNI_TRUE) != 0) {
+ if (NET_InetAddressToSockaddr(env, iaObj, port, &sa,
+ &sa_len, JNI_TRUE) != 0) {
return -1;
}
- rv = connect(fd, (struct sockaddr *)&sa, sa_len);
+ rv = connect(fd, &sa.sa, sa_len);
if (rv == SOCKET_ERROR) {
int err = WSAGetLastError();
if (err == WSAEWOULDBLOCK) {
@@ -217,7 +215,7 @@
SOCKETADDRESS sa;
int len = sizeof(sa);
- if (getsockname(fd, (struct sockaddr *)&sa, &len) == SOCKET_ERROR) {
+ if (getsockname(fd, &sa.sa, &len) == SOCKET_ERROR) {
if (WSAGetLastError() == WSAENOTSOCK) {
JNU_ThrowByName(env, JNU_JAVANETPKG "SocketException",
"Socket closed");
@@ -243,11 +241,11 @@
jclass iaContainerClass;
jfieldID iaFieldID;
- if (getsockname(fd, (struct sockaddr *)&sa, &len) == SOCKET_ERROR) {
+ if (getsockname(fd, &sa.sa, &len) == SOCKET_ERROR) {
NET_ThrowNew(env, WSAGetLastError(), "Error getting socket name");
return;
}
- iaObj = NET_SockaddrToInetAddress(env, (struct sockaddr *)&sa, &port);
+ iaObj = NET_SockaddrToInetAddress(env, &sa, &port);
CHECK_NULL(iaObj);
iaContainerClass = (*env)->GetObjectClass(env, iaContainerObj);
@@ -283,7 +281,7 @@
int len = sizeof(sa);
memset((char *)&sa, 0, len);
- newfd = accept(fd, (struct sockaddr *)&sa, &len);
+ newfd = accept(fd, &sa.sa, &len);
if (newfd == INVALID_SOCKET) {
if (WSAGetLastError() == -2) {
@@ -298,7 +296,7 @@
SetHandleInformation((HANDLE)(UINT_PTR)newfd, HANDLE_FLAG_INHERIT, 0);
- ia = NET_SockaddrToInetAddress(env, (struct sockaddr *)&sa, &port);
+ ia = NET_SockaddrToInetAddress(env, &sa, &port);
isa = (*env)->NewObject(env, isa_class, isa_ctorID, ia, port);
(*env)->SetObjectArrayElement(env, isaa, 0, isa);
diff -r be8643ebe865 -r 6665640c56cf jdk/src/java.base/windows/native/libnet/TwoStacksPlainDatagramSocketImpl.c
--- a/jdk/src/java.base/windows/native/libnet/TwoStacksPlainDatagramSocketImpl.c Fri Jan 13 01:36:02 2017 +0000
+++ b/jdk/src/java.base/windows/native/libnet/TwoStacksPlainDatagramSocketImpl.c Wed Jul 05 22:41:30 2017 +0200
@@ -420,18 +420,13 @@
jboolean exclBind) {
jobject fdObj = (*env)->GetObjectField(env, this, pdsi_fdID);
jobject fd1Obj = (*env)->GetObjectField(env, this, pdsi_fd1ID);
-
- int fd, fd1 = -1, family;
int ipv6_supported = ipv6_available();
-
+ int fd, fd1 = -1, lcladdrlen = 0;
SOCKETADDRESS lcladdr;
- int lcladdrlen = sizeof(SOCKETADDRESS);
- int address;
- memset((char *)&lcladdr, 0, sizeof(lcladdr));
-
- family = getInetAddress_family(env, addressObj);
- if (family == java_net_InetAddress_IPv6 && !ipv6_supported) {
+ if (getInetAddress_family(env, addressObj) == java_net_InetAddress_IPv6 &&
+ !ipv6_supported)
+ {
JNU_ThrowByName(env, JNU_JAVANETPKG "SocketException",
"Protocol family not supported");
return;
@@ -446,14 +441,13 @@
fd1 = (*env)->GetIntField(env, fd1Obj, IO_fd_fdID);
}
}
+
if (IS_NULL(addressObj)) {
JNU_ThrowNullPointerException(env, "argument address");
return;
- } else {
- address = getInetAddress_addr(env, addressObj);
}
- if (NET_InetAddressToSockaddr(env, addressObj, port, &lcladdr.sa,
+ if (NET_InetAddressToSockaddr(env, addressObj, port, &lcladdr,
&lcladdrlen, JNI_FALSE) != 0) {
return;
}
@@ -493,7 +487,7 @@
return;
}
} else {
- if (NET_WinBind(fd, &lcladdr.sa, lcladdrlen, exclBind) == -1) {
+ if (NET_WinBind(fd, &lcladdr, lcladdrlen, exclBind) == -1) {
if (WSAGetLastError() == WSAEACCES) {
WSASetLastError(WSAEADDRINUSE);
}
@@ -507,7 +501,7 @@
NET_ThrowCurrent(env, "getsockname");
return;
}
- port = ntohs((u_short) GET_PORT (&lcladdr));
+ port = ntohs((u_short)GET_PORT(&lcladdr));
}
(*env)->SetIntField(env, this, pdsi_localPortID, port);
}
@@ -520,27 +514,25 @@
*/
JNIEXPORT void JNICALL
-Java_java_net_TwoStacksPlainDatagramSocketImpl_connect0(JNIEnv *env, jobject this,
- jobject address, jint port) {
- /* The object's field */
+Java_java_net_TwoStacksPlainDatagramSocketImpl_connect0
+ (JNIEnv *env, jobject this, jobject address, jint port)
+{
jobject fdObj = (*env)->GetObjectField(env, this, pdsi_fdID);
jobject fd1Obj = (*env)->GetObjectField(env, this, pdsi_fd1ID);
- /* The fdObj'fd */
- jint fd=-1, fd1=-1, fdc;
- /* The packetAddress address, family and port */
- jint addr, family;
+ jint fd = -1, fd1 = -1, fdc, family;
SOCKETADDRESS rmtaddr;
- int rmtaddrlen;
- int ipv6_supported = ipv6_available();
+ int rmtaddrlen = 0;
if (IS_NULL(fdObj) && IS_NULL(fd1Obj)) {
JNU_ThrowByName(env, JNU_JAVANETPKG "SocketException",
"Socket closed");
return;
}
+
if (!IS_NULL(fdObj)) {
fd = (*env)->GetIntField(env, fdObj, IO_fd_fdID);
}
+
if (!IS_NULL(fd1Obj)) {
fd1 = (*env)->GetIntField(env, fd1Obj, IO_fd_fdID);
}
@@ -550,10 +542,8 @@
return;
}
- addr = getInetAddress_addr(env, address);
-
family = getInetAddress_family(env, address);
- if (family == java_net_InetAddress_IPv6 && !ipv6_supported) {
+ if (family == java_net_InetAddress_IPv6 && !ipv6_available()) {
JNU_ThrowByName(env, JNU_JAVANETPKG "SocketException",
"Protocol family not supported");
return;
@@ -572,12 +562,12 @@
res = WSAIoctl(fdc,SIO_UDP_CONNRESET,&t,sizeof(t),&x1,sizeof(x1),&x2,0,0);
}
- if (NET_InetAddressToSockaddr(env, address, port, &rmtaddr.sa,
+ if (NET_InetAddressToSockaddr(env, address, port, &rmtaddr,
&rmtaddrlen, JNI_FALSE) != 0) {
return;
}
- if (connect(fdc, &rmtaddr.sa, sizeof(rmtaddr)) == -1) {
+ if (connect(fdc, &rmtaddr.sa, rmtaddrlen) == -1) {
NET_ThrowCurrent(env, "connect");
return;
}
@@ -631,9 +621,9 @@
* Signature: (Ljava/net/DatagramPacket;)V
*/
JNIEXPORT void JNICALL
-Java_java_net_TwoStacksPlainDatagramSocketImpl_send(JNIEnv *env, jobject this,
- jobject packet) {
-
+Java_java_net_TwoStacksPlainDatagramSocketImpl_send
+ (JNIEnv *env, jobject this, jobject packet)
+{
char BUF[MAX_BUFFER_LEN];
char *fullPacket;
jobject fdObj;
@@ -647,11 +637,10 @@
jbyteArray packetBuffer;
jboolean connected;
- SOCKETADDRESS rmtaddr, *addrp = &rmtaddr;
+ SOCKETADDRESS rmtaddr;
+ struct sockaddr *addrp = 0;
int addrlen = 0;
- memset((char *)&rmtaddr, 0, sizeof(rmtaddr));
-
if (IS_NULL(packet)) {
JNU_ThrowNullPointerException(env, "null packet");
return;
@@ -696,14 +685,13 @@
packetBufferLen = MAX_PACKET_LEN;
}
- if (connected) {
- addrp = 0; /* arg to sendto () null in this case */
- addrlen = 0;
- } else {
- if (NET_InetAddressToSockaddr(env, iaObj, packetPort, &rmtaddr.sa,
+ // sockaddr arg to sendto() is null if already connected
+ if (!connected) {
+ if (NET_InetAddressToSockaddr(env, iaObj, packetPort, &rmtaddr,
&addrlen, JNI_FALSE) != 0) {
return;
}
+ addrp = &rmtaddr.sa;
}
if (packetBufferLen > MAX_BUFFER_LEN) {
@@ -753,11 +741,12 @@
fullPacket = &(BUF[0]);
}
- (*env)->GetByteArrayRegion(env, packetBuffer, packetBufferOffset, packetBufferLen,
- (jbyte *)fullPacket);
- if (sendto(fd, fullPacket, packetBufferLen, 0,
- (struct sockaddr *)addrp, addrlen) == SOCKET_ERROR) {
- NET_ThrowCurrent(env, "Datagram send failed");
+ (*env)->GetByteArrayRegion(env, packetBuffer, packetBufferOffset,
+ packetBufferLen, (jbyte *)fullPacket);
+ if (sendto(fd, fullPacket, packetBufferLen, 0, addrp,
+ addrlen) == SOCKET_ERROR)
+ {
+ NET_ThrowCurrent(env, "Datagram send failed");
}
if (packetBufferLen > MAX_BUFFER_LEN) {
@@ -1147,14 +1136,14 @@
*/
packetAddress = (*env)->GetObjectField(env, packet, dp_addressID);
if (packetAddress != NULL) {
- if (!NET_SockaddrEqualsInetAddress(env, &remote_addr.sa,
+ if (!NET_SockaddrEqualsInetAddress(env, &remote_addr,
packetAddress)) {
/* force a new InetAddress to be created */
packetAddress = NULL;
}
}
if (packetAddress == NULL) {
- packetAddress = NET_SockaddrToInetAddress(env, &remote_addr.sa,
+ packetAddress = NET_SockaddrToInetAddress(env, &remote_addr,
&port);
/* stuff the new Inetaddress in the packet */
(*env)->SetObjectField(env, packet, dp_addressID, packetAddress);
@@ -1431,20 +1420,21 @@
* can't update any existing InetAddress because it is immutable
*/
packetAddress = (*env)->GetObjectField(env, packet, dp_addressID);
-
if (packetAddress != NULL) {
- if (!NET_SockaddrEqualsInetAddress(env, &remote_addr.sa, packetAddress)) {
+ if (!NET_SockaddrEqualsInetAddress(env, &remote_addr,
+ packetAddress)) {
/* force a new InetAddress to be created */
packetAddress = NULL;
}
}
if (packetAddress == NULL) {
- packetAddress = NET_SockaddrToInetAddress(env, &remote_addr.sa, &port);
+ packetAddress = NET_SockaddrToInetAddress(env, &remote_addr,
+ &port);
/* stuff the new Inetaddress in the packet */
(*env)->SetObjectField(env, packet, dp_addressID, packetAddress);
} else {
/* only get the new port number */
- port = NET_GetPortFromSockaddr(&remote_addr.sa);
+ port = NET_GetPortFromSockaddr(&remote_addr);
}
/* populate the packet */
(*env)->SetByteArrayRegion(env, packetBuffer, packetBufferOffset, n,
@@ -1528,7 +1518,7 @@
jobject fdObj = (*env)->GetObjectField(env, this, pdsi_fdID);
jobject fd1Obj = (*env)->GetObjectField(env, this, pdsi_fd1ID);
int ipv6_supported = ipv6_available();
- int fd=-1, fd1=-1;
+ int fd = -1, fd1 = -1;
if (IS_NULL(fdObj) && (!ipv6_supported || IS_NULL(fd1Obj))) {
return;
@@ -1799,7 +1789,7 @@
Java_java_net_TwoStacksPlainDatagramSocketImpl_socketNativeSetOption
(JNIEnv *env,jobject this, jint opt,jobject value)
{
- int fd=-1, fd1=-1;
+ int fd = -1, fd1 = -1;
int levelv4 = 0, levelv6 = 0, optnamev4 = 0, optnamev6 = 0, optlen = 0;
union {
int i;
@@ -2167,7 +2157,7 @@
Java_java_net_TwoStacksPlainDatagramSocketImpl_socketGetOption
(JNIEnv *env, jobject this, jint opt)
{
- int fd=-1, fd1=-1;
+ int fd = -1, fd1 = -1;
int level, optname, optlen;
union {
int i;
@@ -2255,7 +2245,7 @@
(JNIEnv *env, jobject this, jint family)
{
int fd = -1, fd1 = -1;
- SOCKETADDRESS him;
+ SOCKETADDRESS sa;
int len = 0;
int port;
jobject iaObj;
@@ -2288,12 +2278,12 @@
return NULL;
}
- if (getsockname(fd, &him.sa, &len) == -1) {
+ if (getsockname(fd, &sa.sa, &len) == -1) {
JNU_ThrowByNameWithMessageAndLastError
(env, JNU_JAVANETPKG "SocketException", "Error getting socket name");
return NULL;
}
- iaObj = NET_SockaddrToInetAddress(env, &him.sa, &port);
+ iaObj = NET_SockaddrToInetAddress(env, &sa, &port);
return iaObj;
}
@@ -2430,7 +2420,7 @@
int len, family;
int ipv6_supported = ipv6_available();
- int cmd ;
+ int cmd;
memset((char *)&in, 0, sizeof(in));
memset((char *)&name, 0, sizeof(name));
@@ -2452,7 +2442,7 @@
return;
}
- if (NET_InetAddressToSockaddr(env, iaObj, 0, &name.sa, &len, JNI_FALSE) != 0) {
+ if (NET_InetAddressToSockaddr(env, iaObj, 0, &name, &len, JNI_FALSE) != 0) {
return;
}
@@ -2473,7 +2463,7 @@
return;
}
if (IS_NULL(niObj)) {
- len = sizeof (in);
+ len = sizeof(in);
if (NET_GetSockOpt(fd, IPPROTO_IP, IP_MULTICAST_IF,
(char *)&in, &len) < 0) {
NET_ThrowCurrent(env, "get IP_MULTICAST_IF failed");
diff -r be8643ebe865 -r 6665640c56cf jdk/src/java.base/windows/native/libnet/TwoStacksPlainSocketImpl.c
--- a/jdk/src/java.base/windows/native/libnet/TwoStacksPlainSocketImpl.c Fri Jan 13 01:36:02 2017 +0000
+++ b/jdk/src/java.base/windows/native/libnet/TwoStacksPlainSocketImpl.c Wed Jul 05 22:41:30 2017 +0200
@@ -175,8 +175,8 @@
*/
JNIEXPORT void JNICALL
Java_java_net_TwoStacksPlainSocketImpl_socketConnect(JNIEnv *env, jobject this,
- jobject iaObj, jint port,
- jint timeout)
+ jobject iaObj, jint port,
+ jint timeout)
{
jint localport = (*env)->GetIntField(env, this, psi_localportID);
@@ -193,11 +193,11 @@
jobject fdObj = (*env)->GetObjectField(env, this, psi_fdID);
jobject fd1Obj = (*env)->GetObjectField(env, this, psi_fd1ID);
- SOCKETADDRESS him;
+ SOCKETADDRESS sa;
/* The result of the connection */
int connect_res;
- memset((char *)&him, 0, sizeof(him));
+ memset((char *)&sa, 0, sizeof(sa));
if (!IS_NULL(fdObj)) {
fd = (*env)->GetIntField(env, fdObj, IO_fd_fdID);
@@ -212,11 +212,12 @@
return;
}
- if (NET_InetAddressToSockaddr(env, iaObj, port, &him.sa, &len, JNI_FALSE) != 0) {
- return;
+ if (NET_InetAddressToSockaddr(env, iaObj, port, &sa, &len,
+ JNI_FALSE) != 0) {
+ return;
}
- family = him.sa.sa_family;
+ family = sa.sa.sa_family;
if (family == AF_INET6) {
if (!ipv6_supported) {
JNU_ThrowByName(env, JNU_JAVANETPKG "SocketException",
@@ -248,7 +249,7 @@
(*env)->SetObjectField(env, this, psi_fd1ID, NULL);
if (timeout <= 0) {
- connect_res = connect(fd, &him.sa, sizeof(SOCKETADDRESS));
+ connect_res = connect(fd, &sa.sa, sizeof(SOCKETADDRESS));
if (connect_res == SOCKET_ERROR) {
connect_res = WSAGetLastError();
}
@@ -261,7 +262,7 @@
ioctlsocket(fd, FIONBIO, &optval);
/* initiate the connect */
- connect_res = connect(fd, &him.sa, sizeof(SOCKETADDRESS));
+ connect_res = connect(fd, &sa.sa, sizeof(SOCKETADDRESS));
if (connect_res == SOCKET_ERROR) {
if (WSAGetLastError() != WSAEWOULDBLOCK) {
connect_res = WSAGetLastError();
@@ -362,7 +363,7 @@
*/
u_short port;
int len = sizeof(SOCKETADDRESS);
- if (getsockname(fd, &him.sa, &len) == -1) {
+ if (getsockname(fd, &sa.sa, &len) == -1) {
if (WSAGetLastError() == WSAENOTSOCK) {
JNU_ThrowByName(env, JNU_JAVANETPKG "SocketException",
"Socket closed");
@@ -371,7 +372,7 @@
}
return;
}
- port = ntohs((u_short)GET_PORT(&him));
+ port = ntohs((u_short)GET_PORT(&sa));
(*env)->SetIntField(env, this, psi_localportID, (int) port);
}
}
@@ -396,7 +397,7 @@
int family;
int rv;
- SOCKETADDRESS him;
+ SOCKETADDRESS sa;
fdObj = (*env)->GetObjectField(env, this, psi_fdID);
fd1Obj = (*env)->GetObjectField(env, this, psi_fd1ID);
@@ -424,13 +425,13 @@
return;
}
- if (NET_InetAddressToSockaddr(env, iaObj, localport, &him.sa, &len,
+ if (NET_InetAddressToSockaddr(env, iaObj, localport, &sa, &len,
JNI_FALSE) != 0) {
return;
}
if (ipv6_supported) {
struct ipv6bind v6bind;
- v6bind.addr = &him;
+ v6bind.addr = &sa.sa;
v6bind.ipv4_fd = fd;
v6bind.ipv6_fd = fd1;
rv = NET_BindV6(&v6bind, exclBind);
@@ -462,7 +463,7 @@
(*env)->SetObjectField(env, this, psi_fd1ID, NULL);
}
} else {
- rv = NET_WinBind(fd, &him.sa, len, exclBind);
+ rv = NET_WinBind(fd, &sa, len, exclBind);
}
if (rv == -1) {
@@ -481,11 +482,11 @@
int len = sizeof(SOCKETADDRESS);
u_short port;
- if (getsockname(him.sa.sa_family == AF_INET ? fd: fd1, &him.sa, &len) == -1) {
+ if (getsockname(sa.sa.sa_family == AF_INET ? fd : fd1, &sa.sa, &len) == -1) {
NET_ThrowCurrent(env, "getsockname in plain socketBind");
return;
}
- port = ntohs((u_short) GET_PORT (&him));
+ port = ntohs((u_short) GET_PORT (&sa));
(*env)->SetIntField(env, this, psi_localportID, (int)port);
} else {
@@ -529,7 +530,7 @@
JNU_ThrowNullPointerException(env, "socket address");
return;
}
- if (NET_InetAddressToSockaddr(env, address, 0, &addr.sa, &addrlen,
+ if (NET_InetAddressToSockaddr(env, address, 0, &addr, &addrlen,
JNI_FALSE) != 0) {
return;
}
@@ -585,7 +586,7 @@
/* the fd int field on fdObj */
jint fd=-1, fd1=-1;
- SOCKETADDRESS him;
+ SOCKETADDRESS sa;
jint len;
if (IS_NULL(fdObj) && IS_NULL(fd1Obj)) {
@@ -676,7 +677,7 @@
}
}
}
- fd = accept(fd, &him.sa, &len);
+ fd = accept(fd, &sa.sa, &len);
if (fd < 0) {
/* REMIND: SOCKET CLOSED PROBLEM */
if (fd == -2) {
@@ -691,7 +692,7 @@
SetHandleInformation((HANDLE)(UINT_PTR)fd, HANDLE_FLAG_INHERIT, 0);
(*env)->SetIntField(env, socketFdObj, IO_fd_fdID, fd);
- if (him.sa.sa_family == AF_INET) {
+ if (sa.sa.sa_family == AF_INET) {
if (inet4Cls == NULL) {
jclass c = (*env)->FindClass(env, "java/net/Inet4Address");
if (c != NULL) {
@@ -717,7 +718,7 @@
return;
}
- setInetAddress_addr(env, socketAddressObj, ntohl(him.sa4.sin_addr.s_addr));
+ setInetAddress_addr(env, socketAddressObj, ntohl(sa.sa4.sin_addr.s_addr));
setInetAddress_family(env, socketAddressObj, java_net_InetAddress_IPv4);
(*env)->SetObjectField(env, socket, psi_addressID, socketAddressObj);
} else {
@@ -743,14 +744,14 @@
NET_SocketClose(fd);
return;
}
- setInet6Address_ipaddress(env, socketAddressObj, (char *)&him.sa6.sin6_addr);
+ setInet6Address_ipaddress(env, socketAddressObj, (char *)&sa.sa6.sin6_addr);
setInetAddress_family(env, socketAddressObj, java_net_InetAddress_IPv6);
- setInet6Address_scopeid(env, socketAddressObj, him.sa6.sin6_scope_id);
+ setInet6Address_scopeid(env, socketAddressObj, sa.sa6.sin6_scope_id);
}
/* fields common to AF_INET and AF_INET6 */
- port = ntohs ((u_short) GET_PORT (&him));
+ port = ntohs ((u_short)GET_PORT(&sa));
(*env)->SetIntField(env, socket, psi_portID, (int)port);
port = (*env)->GetIntField(env, this, psi_localportID);
(*env)->SetIntField(env, socket, psi_localportID, port);
@@ -1025,14 +1026,14 @@
* SO_BINDADDR isn't a socket option
*/
if (opt == java_net_SocketOptions_SO_BINDADDR) {
- SOCKETADDRESS him;
+ SOCKETADDRESS sa;
int len = sizeof(SOCKETADDRESS);
int port;
jobject iaObj;
jclass iaCntrClass;
jfieldID iaFieldID;
- memset((char *)&him, 0, len);
+ memset((char *)&sa, 0, len);
if (fd == -1) {
/* must be an IPV6 only socket. Case where both sockets are != -1
@@ -1041,12 +1042,12 @@
fd = getFD1 (env, this);
}
- if (getsockname(fd, &him.sa, &len) < 0) {
+ if (getsockname(fd, &sa.sa, &len) < 0) {
JNU_ThrowByNameWithMessageAndLastError
(env, JNU_JAVANETPKG "SocketException", "Error getting socket name");
return -1;
}
- iaObj = NET_SockaddrToInetAddress(env, &him.sa, &port);
+ iaObj = NET_SockaddrToInetAddress(env, &sa, &port);
CHECK_NULL_RETURN(iaObj, -1);
iaCntrClass = (*env)->GetObjectClass(env, iaContainerObj);
diff -r be8643ebe865 -r 6665640c56cf jdk/src/java.base/windows/native/libnet/net_util_md.c
--- a/jdk/src/java.base/windows/native/libnet/net_util_md.c Fri Jan 13 01:36:02 2017 +0000
+++ b/jdk/src/java.base/windows/native/libnet/net_util_md.c Wed Jul 05 22:41:30 2017 +0200
@@ -488,10 +488,10 @@
* Should be only called by the wrapper method NET_WinBind
*/
JNIEXPORT int JNICALL
-NET_Bind(int s, struct sockaddr *him, int len)
+NET_Bind(int s, SOCKETADDRESS *sa, int len)
{
int rv = 0;
- rv = bind(s, him, len);
+ rv = bind(s, &sa->sa, len);
if (rv == SOCKET_ERROR) {
/*
@@ -511,11 +511,11 @@
* if required, and then calls NET_BIND
*/
JNIEXPORT int JNICALL
-NET_WinBind(int s, struct sockaddr *him, int len, jboolean exclBind)
+NET_WinBind(int s, SOCKETADDRESS *sa, int len, jboolean exclBind)
{
if (exclBind == JNI_TRUE)
setExclusiveBind(s);
- return NET_Bind(s, him, len);
+ return NET_Bind(s, sa, len);
}
JNIEXPORT int JNICALL
@@ -677,8 +677,8 @@
if (family == AF_INET && (b->addr->sa4.sin_addr.s_addr != INADDR_ANY)) {
/* bind to v4 only */
int ret;
- ret = NET_WinBind((int)b->ipv4_fd, (struct sockaddr *)b->addr,
- sizeof(SOCKETADDRESS), exclBind);
+ ret = NET_WinBind((int)b->ipv4_fd, b->addr,
+ sizeof(SOCKETADDRESS), exclBind);
if (ret == SOCKET_ERROR) {
CLOSE_SOCKETS_AND_RETURN;
}
@@ -689,7 +689,7 @@
if (family == AF_INET6 && (!IN6_IS_ADDR_ANY(&b->addr->sa6.sin6_addr))) {
/* bind to v6 only */
int ret;
- ret = NET_WinBind((int)b->ipv6_fd, (struct sockaddr *)b->addr,
+ ret = NET_WinBind((int)b->ipv6_fd, b->addr,
sizeof(SOCKETADDRESS), exclBind);
if (ret == SOCKET_ERROR) {
CLOSE_SOCKETS_AND_RETURN;
@@ -719,7 +719,7 @@
oaddr.sa4.sin_addr.s_addr = INADDR_ANY;
}
- rv = NET_WinBind(fd, (struct sockaddr *)b->addr, sizeof(SOCKETADDRESS), exclBind);
+ rv = NET_WinBind(fd, b->addr, sizeof(SOCKETADDRESS), exclBind);
if (rv == SOCKET_ERROR) {
CLOSE_SOCKETS_AND_RETURN;
}
@@ -731,7 +731,7 @@
}
bound_port = GET_PORT (b->addr);
SET_PORT (&oaddr, bound_port);
- if ((rv = NET_WinBind(ofd, &oaddr.sa,
+ if ((rv = NET_WinBind(ofd, &oaddr,
sizeof(SOCKETADDRESS), exclBind)) == SOCKET_ERROR) {
int retries;
int sotype, arglen=sizeof(sotype);
@@ -768,7 +768,7 @@
/* bind random port on first socket */
SET_PORT (&oaddr, 0);
- rv = NET_WinBind(ofd, &oaddr.sa, sizeof(SOCKETADDRESS), exclBind);
+ rv = NET_WinBind(ofd, &oaddr, sizeof(SOCKETADDRESS), exclBind);
if (rv == SOCKET_ERROR) {
CLOSE_SOCKETS_AND_RETURN;
}
@@ -784,8 +784,7 @@
}
bound_port = GET_PORT (&oaddr);
SET_PORT (b->addr, bound_port);
- rv = NET_WinBind(fd, (struct sockaddr *)b->addr,
- sizeof(SOCKETADDRESS), exclBind);
+ rv = NET_WinBind(fd, b->addr, sizeof(SOCKETADDRESS), exclBind);
if (rv != SOCKET_ERROR) {
if (family == AF_INET) {
@@ -853,31 +852,33 @@
return result == SOCKET_ERROR ? WSAGetLastError() : 0;
}
-/* If address types is IPv6, then IPv6 must be available. Otherwise
- * no address can be generated. In the case of an IPv4 Inetaddress this
- * method will return an IPv4 mapped address where IPv6 is available and
- * v4MappedAddress is TRUE. Otherwise it will return a sockaddr_in
- * structure for an IPv4 InetAddress.
-*/
+/**
+ * See net_util.h for documentation
+ */
JNIEXPORT int JNICALL
-NET_InetAddressToSockaddr(JNIEnv *env, jobject iaObj, int port, struct sockaddr *him,
- int *len, jboolean v4MappedAddress) {
- jint family, iafam;
- iafam = getInetAddress_family(env, iaObj);
- family = (iafam == java_net_InetAddress_IPv4)? AF_INET : AF_INET6;
- if (ipv6_available() && !(family == AF_INET && v4MappedAddress == JNI_FALSE)) {
- struct sockaddr_in6 *him6 = (struct sockaddr_in6 *)him;
+NET_InetAddressToSockaddr(JNIEnv *env, jobject iaObj, int port,
+ SOCKETADDRESS *sa, int *len,
+ jboolean v4MappedAddress)
+{
+ jint family = getInetAddress_family(env, iaObj);
+ memset((char *)sa, 0, sizeof(SOCKETADDRESS));
+
+ if (ipv6_available() &&
+ !(family == java_net_InetAddress_IPv4 &&
+ v4MappedAddress == JNI_FALSE))
+ {
jbyte caddr[16];
- jint address, scopeid = 0;
- jint cached_scope_id = 0;
+ jint address;
+ unsigned int scopeid = 0, cached_scope_id = 0;
- if (family == AF_INET) { /* will convert to IPv4-mapped address */
- memset((char *) caddr, 0, 16);
+ if (family == java_net_InetAddress_IPv4) {
+ // convert to IPv4-mapped address
+ memset((char *)caddr, 0, 16);
address = getInetAddress_addr(env, iaObj);
if (address == INADDR_ANY) {
/* we would always prefer IPv6 wildcard address
- caddr[10] = 0xff;
- caddr[11] = 0xff; */
+ * caddr[10] = 0xff;
+ * caddr[11] = 0xff; */
} else {
caddr[10] = 0xff;
caddr[11] = 0xff;
@@ -889,46 +890,39 @@
} else {
getInet6Address_ipaddress(env, iaObj, (char *)caddr);
scopeid = getInet6Address_scopeid(env, iaObj);
- cached_scope_id = (jint)(*env)->GetIntField(env, iaObj, ia6_cachedscopeidID);
+ cached_scope_id = (unsigned int)(*env)->GetIntField(env, iaObj, ia6_cachedscopeidID);
}
-
- memset((char *)him6, 0, sizeof(struct sockaddr_in6));
- him6->sin6_port = (u_short) htons((u_short)port);
- memcpy((void *)&(him6->sin6_addr), caddr, sizeof(struct in6_addr) );
- him6->sin6_family = AF_INET6;
- if ((family == AF_INET6) && IN6_IS_ADDR_LINKLOCAL( &(him6->sin6_addr) )
- && (!scopeid && !cached_scope_id)) {
- cached_scope_id = getDefaultIPv6Interface(env, him6);
+ sa->sa6.sin6_port = (u_short)htons((u_short)port);
+ memcpy((void *)&sa->sa6.sin6_addr, caddr, sizeof(struct in6_addr));
+ sa->sa6.sin6_family = AF_INET6;
+ if ((family == java_net_InetAddress_IPv6) &&
+ IN6_IS_ADDR_LINKLOCAL(&sa->sa6.sin6_addr) &&
+ (!scopeid && !cached_scope_id))
+ {
+ cached_scope_id = getDefaultIPv6Interface(env, &sa->sa6);
(*env)->SetIntField(env, iaObj, ia6_cachedscopeidID, cached_scope_id);
}
- him6->sin6_scope_id = scopeid != 0 ? scopeid : cached_scope_id;
- *len = sizeof(struct sockaddr_in6) ;
+ sa->sa6.sin6_scope_id = scopeid == 0 ? cached_scope_id : scopeid;
+ if (len != NULL) {
+ *len = sizeof(struct sockaddr_in6);
+ }
} else {
- struct sockaddr_in *him4 = (struct sockaddr_in *)him;
jint address;
- if (family != AF_INET) {
- JNU_ThrowByName(env, JNU_JAVANETPKG "SocketException", "Protocol family unavailable");
- return -1;
+ if (family != java_net_InetAddress_IPv4) {
+ JNU_ThrowByName(env, JNU_JAVANETPKG "SocketException", "Protocol family unavailable");
+ return -1;
}
- memset((char *)him4, 0, sizeof(struct sockaddr_in));
address = getInetAddress_addr(env, iaObj);
- him4->sin_port = htons((short) port);
- him4->sin_addr.s_addr = (u_long) htonl(address);
- him4->sin_family = AF_INET;
- *len = sizeof(struct sockaddr_in);
+ sa->sa4.sin_port = htons((short)port);
+ sa->sa4.sin_addr.s_addr = (u_long)htonl(address);
+ sa->sa4.sin_family = AF_INET;
+ if (len != NULL) {
+ *len = sizeof(struct sockaddr_in);
+ }
}
return 0;
}
-JNIEXPORT jint JNICALL
-NET_GetPortFromSockaddr(struct sockaddr *him) {
- if (him->sa_family == AF_INET6) {
- return ntohs(((struct sockaddr_in6 *)him)->sin6_port);
- } else {
- return ntohs(((struct sockaddr_in *)him)->sin_port);
- }
-}
-
int
NET_IsIPv4Mapped(jbyte* caddr) {
int i;
@@ -961,16 +955,6 @@
return 1;
}
-int getScopeID(struct sockaddr *him) {
- struct sockaddr_in6 *him6 = (struct sockaddr_in6 *)him;
- return him6->sin6_scope_id;
-}
-
-int cmpScopeID(unsigned int scope, struct sockaddr *him) {
- struct sockaddr_in6 *him6 = (struct sockaddr_in6 *)him;
- return him6->sin6_scope_id == scope;
-}
-
/**
* Wrapper for select/poll with timeout on a single file descriptor.
*
diff -r be8643ebe865 -r 6665640c56cf jdk/src/java.base/windows/native/libnet/net_util_md.h
--- a/jdk/src/java.base/windows/native/libnet/net_util_md.h Fri Jan 13 01:36:02 2017 +0000
+++ b/jdk/src/java.base/windows/native/libnet/net_util_md.h Wed Jul 05 22:41:30 2017 +0200
@@ -121,7 +121,7 @@
JNIEXPORT int JNICALL NET_BindV6(struct ipv6bind *b, jboolean exclBind);
-JNIEXPORT int JNICALL NET_WinBind(int s, struct sockaddr *him, int len,
+JNIEXPORT int JNICALL NET_WinBind(int s, SOCKETADDRESS *sa, int len,
jboolean exclBind);
/* XP versions of the native routines */
diff -r be8643ebe865 -r 6665640c56cf jdk/src/java.base/windows/native/libnio/ch/DatagramChannelImpl.c
--- a/jdk/src/java.base/windows/native/libnio/ch/DatagramChannelImpl.c Fri Jan 13 01:36:02 2017 +0000
+++ b/jdk/src/java.base/windows/native/libnio/ch/DatagramChannelImpl.c Wed Jul 05 22:41:30 2017 +0200
@@ -96,7 +96,7 @@
break;
}
if (recvfrom(fd, buf, 1, MSG_PEEK,
- (struct sockaddr *)&sa, &addrlen) != SOCKET_ERROR) {
+ &sa.sa, &addrlen) != SOCKET_ERROR) {
break;
}
if (WSAGetLastError() != WSAECONNRESET) {
@@ -104,7 +104,7 @@
break;
}
- recvfrom(fd, buf, 1, 0, (struct sockaddr *)&sa, &addrlen);
+ recvfrom(fd, buf, 1, 0, &sa.sa, &addrlen);
got_icmp = JNI_TRUE;
}
@@ -122,7 +122,7 @@
memset(&sa, 0, sa_len);
- rv = connect((SOCKET)fd, (struct sockaddr *)&sa, sa_len);
+ rv = connect((SOCKET)fd, &sa.sa, sa_len);
if (rv == SOCKET_ERROR) {
handleSocketError(env, WSAGetLastError());
} else {
@@ -153,7 +153,7 @@
(char *)buf,
len,
0,
- (struct sockaddr *)&sa,
+ &sa.sa,
&sa_len);
if (n == SOCKET_ERROR) {
@@ -182,12 +182,11 @@
*/
senderAddr = (*env)->GetObjectField(env, this, dci_senderAddrID);
if (senderAddr != NULL) {
- if (!NET_SockaddrEqualsInetAddress(env, (struct sockaddr *)&sa,
- senderAddr)) {
+ if (!NET_SockaddrEqualsInetAddress(env, &sa, senderAddr)) {
senderAddr = NULL;
} else {
jint port = (*env)->GetIntField(env, this, dci_senderPortID);
- if (port != NET_GetPortFromSockaddr((struct sockaddr *)&sa)) {
+ if (port != NET_GetPortFromSockaddr(&sa)) {
senderAddr = NULL;
}
}
@@ -195,7 +194,7 @@
if (senderAddr == NULL) {
jobject isa = NULL;
int port;
- jobject ia = NET_SockaddrToInetAddress(env, (struct sockaddr *)&sa, &port);
+ jobject ia = NET_SockaddrToInetAddress(env, &sa, &port);
if (ia != NULL) {
isa = (*env)->NewObject(env, isa_class, isa_ctorID, ia, port);
}
@@ -204,7 +203,7 @@
// update cachedSenderInetAddress/cachedSenderPort
(*env)->SetObjectField(env, this, dci_senderAddrID, ia);
(*env)->SetIntField(env, this, dci_senderPortID,
- NET_GetPortFromSockaddr((struct sockaddr *)&sa));
+ NET_GetPortFromSockaddr(&sa));
(*env)->SetObjectField(env, this, dci_senderID, isa);
}
return n;
@@ -219,21 +218,15 @@
jint fd = fdval(env, fdo);
void *buf = (void *)jlong_to_ptr(address);
SOCKETADDRESS sa;
- int sa_len;
+ int sa_len = 0;
jint rv = 0;
- if (NET_InetAddressToSockaddr(env, destAddress, destPort,
- (struct sockaddr *)&sa,
- &sa_len, preferIPv6) != 0) {
+ if (NET_InetAddressToSockaddr(env, destAddress, destPort, &sa,
+ &sa_len, preferIPv6) != 0) {
return IOS_THROWN;
}
- rv = sendto((SOCKET)fd,
- buf,
- len,
- 0,
- (struct sockaddr *)&sa,
- sa_len);
+ rv = sendto((SOCKET)fd, buf, len, 0, &sa.sa, sa_len);
if (rv == SOCKET_ERROR) {
int theErr = (jint)WSAGetLastError();
if (theErr == WSAEWOULDBLOCK) {
diff -r be8643ebe865 -r 6665640c56cf jdk/src/java.base/windows/native/libnio/ch/Net.c
--- a/jdk/src/java.base/windows/native/libnio/ch/Net.c Fri Jan 13 01:36:02 2017 +0000
+++ b/jdk/src/java.base/windows/native/libnio/ch/Net.c Wed Jul 05 22:41:30 2017 +0200
@@ -168,13 +168,13 @@
{
SOCKETADDRESS sa;
int rv;
- int sa_len;
+ int sa_len = 0;
- if (NET_InetAddressToSockaddr(env, iao, port, (struct sockaddr *)&sa, &sa_len, preferIPv6) != 0) {
- return;
+ if (NET_InetAddressToSockaddr(env, iao, port, &sa, &sa_len, preferIPv6) != 0) {
+ return;
}
- rv = NET_WinBind(fdval(env, fdo), (struct sockaddr *)&sa, sa_len, isExclBind);
+ rv = NET_WinBind(fdval(env, fdo), &sa, sa_len, isExclBind);
if (rv == SOCKET_ERROR)
NET_ThrowNew(env, WSAGetLastError(), "bind");
}
@@ -194,14 +194,14 @@
{
SOCKETADDRESS sa;
int rv;
- int sa_len;
+ int sa_len = 0;
SOCKET s = (SOCKET)fdval(env, fdo);
- if (NET_InetAddressToSockaddr(env, iao, port, (struct sockaddr *)&sa, &sa_len, preferIPv6) != 0) {
+ if (NET_InetAddressToSockaddr(env, iao, port, &sa, &sa_len, preferIPv6) != 0) {
return IOS_THROWN;
}
- rv = connect(s, (struct sockaddr *)&sa, sa_len);
+ rv = connect(s, &sa.sa, sa_len);
if (rv != 0) {
int err = WSAGetLastError();
if (err == WSAEINPROGRESS || err == WSAEWOULDBLOCK) {
@@ -226,7 +226,7 @@
SOCKETADDRESS sa;
int sa_len = sizeof(sa);
- if (getsockname(fdval(env, fdo), (struct sockaddr *)&sa, &sa_len) < 0) {
+ if (getsockname(fdval(env, fdo), &sa.sa, &sa_len) < 0) {
int error = WSAGetLastError();
if (error == WSAEINVAL) {
return 0;
@@ -234,7 +234,7 @@
NET_ThrowNew(env, error, "getsockname");
return IOS_THROWN;
}
- return NET_GetPortFromSockaddr((struct sockaddr *)&sa);
+ return NET_GetPortFromSockaddr(&sa);
}
JNIEXPORT jobject JNICALL
@@ -244,11 +244,11 @@
int sa_len = sizeof(sa);
int port;
- if (getsockname(fdval(env, fdo), (struct sockaddr *)&sa, &sa_len) < 0) {
+ if (getsockname(fdval(env, fdo), &sa.sa, &sa_len) < 0) {
NET_ThrowNew(env, WSAGetLastError(), "getsockname");
return NULL;
}
- return NET_SockaddrToInetAddress(env, (struct sockaddr *)&sa, &port);
+ return NET_SockaddrToInetAddress(env, &sa, &port);
}
JNIEXPORT jint JNICALL
@@ -257,7 +257,7 @@
SOCKETADDRESS sa;
int sa_len = sizeof(sa);
- if (getpeername(fdval(env, fdo), (struct sockaddr *)&sa, &sa_len) < 0) {
+ if (getpeername(fdval(env, fdo), &sa.sa, &sa_len) < 0) {
int error = WSAGetLastError();
if (error == WSAEINVAL) {
return 0;
@@ -265,7 +265,7 @@
NET_ThrowNew(env, error, "getsockname");
return IOS_THROWN;
}
- return NET_GetPortFromSockaddr((struct sockaddr *)&sa);
+ return NET_GetPortFromSockaddr(&sa);
}
JNIEXPORT jobject JNICALL
@@ -275,11 +275,11 @@
int sa_len = sizeof(sa);
int port;
- if (getpeername(fdval(env, fdo), (struct sockaddr *)&sa, &sa_len) < 0) {
+ if (getpeername(fdval(env, fdo), &sa.sa, &sa_len) < 0) {
NET_ThrowNew(env, WSAGetLastError(), "getsockname");
return NULL;
}
- return NET_SockaddrToInetAddress(env, (struct sockaddr *)&sa, &port);
+ return NET_SockaddrToInetAddress(env, &sa, &port);
}
JNIEXPORT jint JNICALL
diff -r be8643ebe865 -r 6665640c56cf jdk/src/java.base/windows/native/libnio/ch/ServerSocketChannelImpl.c
--- a/jdk/src/java.base/windows/native/libnio/ch/ServerSocketChannelImpl.c Fri Jan 13 01:36:02 2017 +0000
+++ b/jdk/src/java.base/windows/native/libnio/ch/ServerSocketChannelImpl.c Wed Jul 05 22:41:30 2017 +0200
@@ -95,7 +95,7 @@
int addrlen = sizeof(sa);
memset((char *)&sa, 0, sizeof(sa));
- newfd = (jint)accept(ssfd, (struct sockaddr *)&sa, &addrlen);
+ newfd = (jint)accept(ssfd, &sa.sa, &addrlen);
if (newfd == INVALID_SOCKET) {
int theErr = (jint)WSAGetLastError();
if (theErr == WSAEWOULDBLOCK) {
@@ -107,7 +107,7 @@
SetHandleInformation((HANDLE)(UINT_PTR)newfd, HANDLE_FLAG_INHERIT, 0);
(*env)->SetIntField(env, newfdo, fd_fdID, newfd);
- remote_ia = NET_SockaddrToInetAddress(env, (struct sockaddr *)&sa, (int *)&remote_port);
+ remote_ia = NET_SockaddrToInetAddress(env, &sa, (int *)&remote_port);
CHECK_NULL_RETURN(remote_ia, IOS_THROWN);
isa = (*env)->NewObject(env, isa_class, isa_ctorID, remote_ia, remote_port);
diff -r be8643ebe865 -r 6665640c56cf jdk/src/java.base/windows/native/libnio/ch/WindowsAsynchronousSocketChannelImpl.c
--- a/jdk/src/java.base/windows/native/libnio/ch/WindowsAsynchronousSocketChannelImpl.c Fri Jan 13 01:36:02 2017 +0000
+++ b/jdk/src/java.base/windows/native/libnio/ch/WindowsAsynchronousSocketChannelImpl.c Wed Jul 05 22:41:30 2017 +0200
@@ -88,26 +88,21 @@
Java_sun_nio_ch_WindowsAsynchronousSocketChannelImpl_connect0(JNIEnv* env, jclass this,
jlong socket, jboolean preferIPv6, jobject iao, jint port, jlong ov)
{
- SOCKET s = (SOCKET) jlong_to_ptr(socket);
- OVERLAPPED* lpOverlapped = (OVERLAPPED*) jlong_to_ptr(ov);
+ SOCKET s = (SOCKET)jlong_to_ptr(socket);
+ OVERLAPPED *lpOverlapped = (OVERLAPPED *)jlong_to_ptr(ov);
SOCKETADDRESS sa;
- int sa_len;
+ int sa_len = 0;
BOOL res;
- if (NET_InetAddressToSockaddr(env, iao, port, (struct sockaddr *)&sa, &sa_len, preferIPv6) != 0) {
+ if (NET_InetAddressToSockaddr(env, iao, port, &sa, &sa_len,
+ preferIPv6) != 0) {
return IOS_THROWN;
}
ZeroMemory((PVOID)lpOverlapped, sizeof(OVERLAPPED));
- res = (*ConnectEx_func)(s,
- (struct sockaddr *)&sa,
- sa_len,
- NULL,
- 0,
- NULL,
- lpOverlapped);
+ res = (*ConnectEx_func)(s, &sa.sa, sa_len, NULL, 0, NULL, lpOverlapped);
if (res == 0) {
int error = GetLastError();
if (error == ERROR_IO_PENDING) {
diff -r be8643ebe865 -r 6665640c56cf jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java
--- a/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java Fri Jan 13 01:36:02 2017 +0000
+++ b/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java Wed Jul 05 22:41:30 2017 +0200
@@ -231,6 +231,7 @@
private boolean isFullScreenAnimationOn;
private volatile boolean isInFullScreen;
+ private volatile boolean isIconifyAnimationActive;
private Window target;
private LWWindowPeer peer;
@@ -997,6 +998,9 @@
if (peer != null) {
peer.notifyIconify(iconify);
}
+ if (iconify) {
+ isIconifyAnimationActive = false;
+ }
}
private void deliverZoom(final boolean isZoomed) {
@@ -1071,6 +1075,17 @@
return true;
}
+ private boolean isIconified() {
+ boolean isIconified = false;
+ if (target instanceof Frame) {
+ int state = ((Frame)target).getExtendedState();
+ if ((state & Frame.ICONIFIED) != 0) {
+ isIconified = true;
+ }
+ }
+ return isIconifyAnimationActive || isIconified;
+ }
+
private boolean isOneOfOwnersOrSelf(CPlatformWindow window) {
while (window != null) {
if (this == window) {
@@ -1094,11 +1109,14 @@
// the windows are ordered above their nearest owner; ancestors of the window,
// which is going to become 'main window', are placed above their siblings.
CPlatformWindow rootOwner = getRootOwner();
- if (rootOwner.isVisible()) {
+ if (rootOwner.isVisible() && !rootOwner.isIconified()) {
CWrapper.NSWindow.orderFront(rootOwner.getNSWindowPtr());
}
- final WindowAccessor windowAccessor = AWTAccessor.getWindowAccessor();
- orderAboveSiblingsImpl(windowAccessor.getOwnedWindows(rootOwner.target));
+ // Do not order child windows of iconified owner.
+ if (!rootOwner.isIconified()) {
+ final WindowAccessor windowAccessor = AWTAccessor.getWindowAccessor();
+ orderAboveSiblingsImpl(windowAccessor.getOwnedWindows(rootOwner.target));
+ }
}
private void orderAboveSiblingsImpl(Window[] windows) {
@@ -1109,10 +1127,12 @@
// Go through the list of windows and perform ordering.
for (Window w : windows) {
+ boolean iconified = false;
final Object p = componentAccessor.getPeer(w);
if (p instanceof LWWindowPeer) {
CPlatformWindow pw = (CPlatformWindow)((LWWindowPeer)p).getPlatformWindow();
- if (pw != null && pw.isVisible()) {
+ iconified = isIconified();
+ if (pw != null && pw.isVisible() && !iconified) {
// If the window is one of ancestors of 'main window' or is going to become main by itself,
// the window should be ordered above its siblings; otherwise the window is just ordered
// above its nearest parent.
@@ -1125,10 +1145,13 @@
pw.applyWindowLevel(w);
}
}
- // Retrieve the child windows for each window from the list and store them for future use.
+ // Retrieve the child windows for each window from the list except iconified ones
+ // and store them for future use.
// Note: we collect data about child windows even for invisible owners, since they may have
// visible children.
- childWindows.addAll(Arrays.asList(windowAccessor.getOwnedWindows(w)));
+ if (!iconified) {
+ childWindows.addAll(Arrays.asList(windowAccessor.getOwnedWindows(w)));
+ }
}
// If some windows, which have just been ordered, have any child windows, let's start new iteration
// and order these child windows.
@@ -1149,6 +1172,10 @@
// NATIVE CALLBACKS
// ----------------------------------------------------------------------
+ private void windowWillMiniaturize() {
+ isIconifyAnimationActive = true;
+ }
+
private void windowDidBecomeMain() {
if (checkBlockingAndOrder()) return;
// If it's not blocked, make sure it's above its siblings
diff -r be8643ebe865 -r 6665640c56cf jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/AWTWindow.m
--- a/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/AWTWindow.m Fri Jan 13 01:36:02 2017 +0000
+++ b/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/AWTWindow.m Wed Jul 05 22:41:30 2017 +0200
@@ -327,10 +327,43 @@
return [window isKindOfClass: [AWTWindow_Panel class]] || [window isKindOfClass: [AWTWindow_Normal class]];
}
+// Retrieves the list of possible window layers (levels)
++ (NSArray*) getWindowLayers {
+ static NSArray *windowLayers;
+ static dispatch_once_t token;
+
+ // Initialize the list of possible window layers
+ dispatch_once(&token, ^{
+ // The layers are ordered from front to back, (i.e. the toppest one is the first)
+ windowLayers = [NSArray arrayWithObjects:
+ [NSNumber numberWithInt:CGWindowLevelForKey(kCGPopUpMenuWindowLevelKey)],
+ [NSNumber numberWithInt:CGWindowLevelForKey(kCGFloatingWindowLevelKey)],
+ [NSNumber numberWithInt:CGWindowLevelForKey(kCGNormalWindowLevelKey)],
+ nil
+ ];
+ [windowLayers retain];
+ });
+ return windowLayers;
+}
+
// returns id for the topmost window under mouse
+ (NSInteger) getTopmostWindowUnderMouseID {
NSInteger result = -1;
+ NSArray *windowLayers = [AWTWindow getWindowLayers];
+ // Looking for the window under mouse starting from the toppest layer
+ for (NSNumber *layer in windowLayers) {
+ result = [AWTWindow getTopmostWindowUnderMouseIDImpl:[layer integerValue]];
+ if (result != -1) {
+ break;
+ }
+ }
+ return result;
+}
+
++ (NSInteger) getTopmostWindowUnderMouseIDImpl:(NSInteger)windowLayer {
+ NSInteger result = -1;
+
NSRect screenRect = [[NSScreen mainScreen] frame];
NSPoint nsMouseLocation = [NSEvent mouseLocation];
CGPoint cgMouseLocation = CGPointMake(nsMouseLocation.x, screenRect.size.height - nsMouseLocation.y);
@@ -339,7 +372,7 @@
for (NSDictionary *window in windows) {
NSInteger layer = [[window objectForKey:(id)kCGWindowLayer] integerValue];
- if (layer == 0) {
+ if (layer == windowLayer) {
CGRect rect;
CGRectMakeWithDictionaryRepresentation((CFDictionaryRef)[window objectForKey:(id)kCGWindowBounds], &rect);
if (CGRectContainsPoint(rect, cgMouseLocation)) {
@@ -639,6 +672,14 @@
AWT_ASSERT_APPKIT_THREAD;
self.isMinimizing = YES;
+
+ JNIEnv *env = [ThreadUtilities getJNIEnv];
+ jobject platformWindow = [self.javaPlatformWindow jObjectWithEnv:env];
+ if (platformWindow != NULL) {
+ static JNF_MEMBER_CACHE(jm_windowWillMiniaturize, jc_CPlatformWindow, "windowWillMiniaturize", "()V");
+ JNFCallVoidMethod(env, platformWindow, jm_windowWillMiniaturize);
+ (*env)->DeleteLocalRef(env, platformWindow);
+ }
// Excplicitly make myself a key window to avoid possible
// negative visual effects during iconify operation
[self.nsWindow makeKeyAndOrderFront:self.nsWindow];
diff -r be8643ebe865 -r 6665640c56cf jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFImageReader.java
--- a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFImageReader.java Fri Jan 13 01:36:02 2017 +0000
+++ b/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFImageReader.java Wed Jul 05 22:41:30 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 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
@@ -730,18 +730,47 @@
// to use it if the data layout is component type.
if (iccProfileField != null
&& itsRaw.getColorModel() instanceof ComponentColorModel) {
- // Create a ColorSpace from the profile.
- byte[] iccProfileValue = iccProfileField.getAsBytes();
- ICC_Profile iccProfile
- = ICC_Profile.getInstance(iccProfileValue);
- ICC_ColorSpace iccColorSpace
- = new ICC_ColorSpace(iccProfile);
-
// Get the raw sample and color information.
ColorModel cmRaw = itsRaw.getColorModel();
ColorSpace csRaw = cmRaw.getColorSpace();
SampleModel smRaw = itsRaw.getSampleModel();
+ ColorSpace iccColorSpace = null;
+ try {
+ // Create a ColorSpace from the profile.
+ byte[] iccProfileValue = iccProfileField.getAsBytes();
+ ICC_Profile iccProfile
+ = ICC_Profile.getInstance(iccProfileValue);
+ iccColorSpace = new ICC_ColorSpace(iccProfile);
+
+ // Workaround for JDK-8145241: test a conversion and fall
+ // back to a standard ColorSpace if it fails. This
+ // workaround could be removed if JDK-8145241 is fixed.
+ float[] rgb =
+ iccColorSpace.toRGB(new float[] {1.0F, 1.0F, 1.0F});
+ } catch (Exception iccProfileException) {
+ processWarningOccurred("Superseding bad ICC profile: "
+ + iccProfileException.getMessage());
+
+ if (iccColorSpace != null) {
+ switch (iccColorSpace.getType()) {
+ case ColorSpace.TYPE_GRAY:
+ iccColorSpace =
+ ColorSpace.getInstance(ColorSpace.CS_GRAY);
+ break;
+ case ColorSpace.TYPE_RGB:
+ iccColorSpace =
+ ColorSpace.getInstance(ColorSpace.CS_sRGB);
+ break;
+ default:
+ iccColorSpace = csRaw;
+ break;
+ }
+ } else {
+ iccColorSpace = csRaw;
+ }
+ }
+
// Get the number of samples per pixel and the number
// of color components.
int numBands = smRaw.getNumBands();
diff -r be8643ebe865 -r 6665640c56cf jdk/src/java.desktop/share/classes/java/beans/AppletInitializer.java
--- a/jdk/src/java.desktop/share/classes/java/beans/AppletInitializer.java Fri Jan 13 01:36:02 2017 +0000
+++ b/jdk/src/java.desktop/share/classes/java/beans/AppletInitializer.java Wed Jul 05 22:41:30 2017 +0200
@@ -30,21 +30,20 @@
import java.beans.beancontext.BeanContext;
/**
- *
* This interface is designed to work in collusion with java.beans.Beans.instantiate.
* The interface is intended to provide mechanism to allow the proper
* initialization of JavaBeans that are also Applets, during their
* instantiation by java.beans.Beans.instantiate().
- *
*
* @see java.beans.Beans#instantiate
*
* @since 1.2
*
+ * @deprecated The Applet API is deprecated. See the
+ * java.applet package
+ * documentation for further information.
*/
-
-
-@SuppressWarnings("deprecation")
+@Deprecated(since = "9")
public interface AppletInitializer {
/**
@@ -74,7 +73,6 @@
* @param bCtxt The BeanContext intended for this Applet, or
* null.
*/
-
void initialize(Applet newAppletBean, BeanContext bCtxt);
/**
@@ -86,6 +84,5 @@
*
* @param newApplet The newly instantiated JavaBean
*/
-
void activate(Applet newApplet);
}
diff -r be8643ebe865 -r 6665640c56cf jdk/src/java.desktop/share/classes/java/beans/Beans.java
--- a/jdk/src/java.desktop/share/classes/java/beans/Beans.java Fri Jan 13 01:36:02 2017 +0000
+++ b/jdk/src/java.desktop/share/classes/java/beans/Beans.java Wed Jul 05 22:41:30 2017 +0200
@@ -97,8 +97,10 @@
* @exception IOException if an I/O error occurs.
* @since 1.2
*/
-
- public static Object instantiate(ClassLoader cls, String beanName, BeanContext beanContext) throws IOException, ClassNotFoundException {
+ @SuppressWarnings("deprecation")
+ public static Object instantiate(ClassLoader cls, String beanName,
+ BeanContext beanContext)
+ throws IOException, ClassNotFoundException {
return Beans.instantiate(cls, beanName, beanContext, null);
}
@@ -153,10 +155,18 @@
* object could not be found.
* @exception IOException if an I/O error occurs.
* @since 1.2
+ *
+ * @deprecated It is recommended to use
+ * {@link #instantiate(ClassLoader, String, BeanContext)},
+ * because the Applet API is deprecated. See the
+ * java.applet package
+ * documentation for further information.
*/
- @SuppressWarnings("deprecation")
- public static Object instantiate(ClassLoader cls, String beanName, BeanContext beanContext, AppletInitializer initializer)
- throws IOException, ClassNotFoundException {
+ @Deprecated(since = "9")
+ public static Object instantiate(ClassLoader cls, String beanName,
+ BeanContext beanContext,
+ AppletInitializer initializer)
+ throws IOException, ClassNotFoundException {
InputStream ins;
ObjectInputStream oins = null;
@@ -501,7 +511,7 @@
* Package private support class. This provides a default AppletContext
* for beans which are applets.
*/
-@SuppressWarnings("deprecation")
+@Deprecated(since = "9")
class BeansAppletContext implements AppletContext {
Applet target;
Hashtable imageCache = new Hashtable<>();
@@ -586,7 +596,7 @@
* Package private support class. This provides an AppletStub
* for beans which are applets.
*/
-@SuppressWarnings("deprecation")
+@Deprecated(since = "9")
class BeansAppletStub implements AppletStub {
transient boolean active;
transient Applet target;
diff -r be8643ebe865 -r 6665640c56cf jdk/src/java.desktop/share/classes/javax/swing/PopupFactory.java
--- a/jdk/src/java.desktop/share/classes/javax/swing/PopupFactory.java Fri Jan 13 01:36:02 2017 +0000
+++ b/jdk/src/java.desktop/share/classes/javax/swing/PopupFactory.java Wed Jul 05 22:41:30 2017 +0200
@@ -260,6 +260,7 @@
* Obtains the appropriate Popup based on
* popupType.
*/
+ @SuppressWarnings("deprecation")
private Popup getPopup(Component owner, Component contents,
int ownerX, int ownerY, int popupType) {
if (GraphicsEnvironment.isHeadless()) {
diff -r be8643ebe865 -r 6665640c56cf jdk/src/java.desktop/share/classes/javax/swing/RepaintManager.java
--- a/jdk/src/java.desktop/share/classes/javax/swing/RepaintManager.java Fri Jan 13 01:36:02 2017 +0000
+++ b/jdk/src/java.desktop/share/classes/javax/swing/RepaintManager.java Wed Jul 05 22:41:30 2017 +0200
@@ -525,8 +525,12 @@
* @param h Height of the region to repaint
* @see JApplet#repaint
* @since 1.6
+ *
+ * @deprecated The Applet API is deprecated. See the
+ * java.applet package
+ * documentation for further information.
*/
- @SuppressWarnings("deprecation")
+ @Deprecated(since = "9")
public void addDirtyRegion(Applet applet, int x, int y, int w, int h) {
addDirtyRegion0(applet, x, y, w, h);
}
diff -r be8643ebe865 -r 6665640c56cf jdk/src/java.desktop/share/classes/javax/swing/TablePrintable.java
--- a/jdk/src/java.desktop/share/classes/javax/swing/TablePrintable.java Fri Jan 13 01:36:02 2017 +0000
+++ b/jdk/src/java.desktop/share/classes/javax/swing/TablePrintable.java Wed Jul 05 22:41:30 2017 +0200
@@ -380,6 +380,12 @@
// print the current section of the table
g2d.translate(-clip.x, -clip.y);
g2d.clip(clip);
+
+ // set a property so that BasicTableUI#paint can know JTable printMode
+ // is FIT_WIDTH since TablePrintable.printMode is not accessible from BasicTableUI
+ if (printMode == JTable.PrintMode.FIT_WIDTH) {
+ table.putClientProperty("Table.printMode", JTable.PrintMode.FIT_WIDTH);
+ }
table.print(g2d);
// restore the original transform and clip
@@ -407,8 +413,18 @@
for(int visrow = rMin; visrow < rMax; visrow++) {
rowHeight += table.getRowHeight(visrow);
}
- g2d.drawRect(0, 0, visibleBounds.width, hclip.height + rowHeight);
+ // If PrintMode is FIT_WIDTH, then draw rect for entire column width while
+ // printing irrespective of how many columns are visible in console
+ if (printMode == JTable.PrintMode.FIT_WIDTH) {
+ g2d.drawRect(0, 0, clip.width, hclip.height + rowHeight);
+ } else {
+ g2d.drawRect(0, 0, visibleBounds.width, hclip.height + rowHeight);
+ }
+ // clear the property
+ if (printMode == JTable.PrintMode.FIT_WIDTH) {
+ table.putClientProperty("Table.printMode", null);
+ }
// dispose the graphics copy
g2d.dispose();
@@ -534,5 +550,4 @@
} while (clip.width + colWidth <= pw);
}
-
}
diff -r be8643ebe865 -r 6665640c56cf jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTableUI.java
--- a/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTableUI.java Fri Jan 13 01:36:02 2017 +0000
+++ b/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTableUI.java Wed Jul 05 22:41:30 2017 +0200
@@ -1812,12 +1812,12 @@
}
boolean ltr = table.getComponentOrientation().isLeftToRight();
-
+ Point upperLeft, lowerRight;
// compute the visible part of table which needs to be painted
Rectangle visibleBounds = clip.intersection(bounds);
- Point upperLeft = visibleBounds.getLocation();
- Point lowerRight = new Point(visibleBounds.x + visibleBounds.width - 1,
- visibleBounds.y + visibleBounds.height - 1);
+ upperLeft = visibleBounds.getLocation();
+ lowerRight = new Point(visibleBounds.x + visibleBounds.width - 1,
+ visibleBounds.y + visibleBounds.height - 1);
int rMin = table.rowAtPoint(upperLeft);
int rMax = table.rowAtPoint(lowerRight);
@@ -1834,6 +1834,18 @@
rMax = table.getRowCount()-1;
}
+ // For FIT_WIDTH, all columns should be printed irrespective of
+ // how many columns are visible. So, we used clip which is already set to
+ // total col width instead of visible region
+ // Since JTable.PrintMode is not accessible
+ // from here, we aet "Table.printMode" in TablePrintable#print and
+ // access from here.
+ Object printMode = table.getClientProperty("Table.printMode");
+ if ((printMode == JTable.PrintMode.FIT_WIDTH)) {
+ upperLeft = clip.getLocation();
+ lowerRight = new Point(clip.x + clip.width - 1,
+ clip.y + clip.height - 1);
+ }
int cMin = table.columnAtPoint(ltr ? upperLeft : lowerRight);
int cMax = table.columnAtPoint(ltr ? lowerRight : upperLeft);
// This should never happen.
@@ -2018,7 +2030,7 @@
int y = damagedArea.y;
for (int row = rMin; row <= rMax; row++) {
y += table.getRowHeight(row);
- g.drawLine(damagedArea.x, y - 1, tableWidth - 1, y - 1);
+ SwingUtilities2.drawHLine(g, damagedArea.x, tableWidth - 1, y - 1);
}
}
if (table.getShowVerticalLines()) {
@@ -2030,14 +2042,14 @@
for (int column = cMin; column <= cMax; column++) {
int w = cm.getColumn(column).getWidth();
x += w;
- g.drawLine(x - 1, 0, x - 1, tableHeight - 1);
+ SwingUtilities2.drawVLine(g, x - 1, 0, tableHeight - 1);
}
} else {
x = damagedArea.x;
for (int column = cMax; column >= cMin; column--) {
int w = cm.getColumn(column).getWidth();
x += w;
- g.drawLine(x - 1, 0, x - 1, tableHeight - 1);
+ SwingUtilities2.drawVLine(g, x - 1, 0, tableHeight - 1);
}
}
}
diff -r be8643ebe865 -r 6665640c56cf jdk/src/java.desktop/share/classes/javax/swing/text/PasswordView.java
--- a/jdk/src/java.desktop/share/classes/javax/swing/text/PasswordView.java Fri Jan 13 01:36:02 2017 +0000
+++ b/jdk/src/java.desktop/share/classes/javax/swing/text/PasswordView.java Wed Jul 05 22:41:30 2017 +0200
@@ -27,10 +27,7 @@
import sun.swing.SwingUtilities2;
import java.awt.*;
import java.awt.font.FontRenderContext;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
import javax.swing.JPasswordField;
-import static javax.swing.text.PlainView.isFPMethodOverriden;
/**
* Implements a View suitable for use in JPasswordField
@@ -332,22 +329,6 @@
static char[] ONE = new char[1];
- private final boolean drawEchoCharacterOverridden;
-
- {
- final Class CLS = getClass();
- final Class INT = Integer.TYPE;
- final Class FP = Float.TYPE;
- final Class CHAR = Character.TYPE;
-
- drawEchoCharacterOverridden = AccessController
- .doPrivileged(new PrivilegedAction() {
- @Override
- public Boolean run() {
- Class[] intTypes = {Graphics.class, INT, INT, CHAR};
- Class[] fpTypes = {Graphics2D.class, FP, FP, CHAR};
- return isFPMethodOverriden("drawEchoCharacter", CLS, intTypes, fpTypes);
- }
- });
- }
+ private final boolean drawEchoCharacterOverridden =
+ getFPMethodOverridden(getClass(), "drawEchoCharacter", FPMethodArgs.GNNC);
}
diff -r be8643ebe865 -r 6665640c56cf jdk/src/java.desktop/share/classes/javax/swing/text/PlainView.java
--- a/jdk/src/java.desktop/share/classes/javax/swing/text/PlainView.java Fri Jan 13 01:36:02 2017 +0000
+++ b/jdk/src/java.desktop/share/classes/javax/swing/text/PlainView.java Wed Jul 05 22:41:30 2017 +0200
@@ -32,6 +32,8 @@
import java.util.Objects;
import javax.swing.event.*;
import java.lang.reflect.Module;
+import java.lang.ref.SoftReference;
+import java.util.HashMap;
/**
* Implements View interface for a simple multi-line text view
@@ -818,10 +820,45 @@
return w;
}
- static boolean isFPMethodOverriden(String method,
- Class cls,
- Class[] intTypes,
- Class[] fpTypes)
+ static boolean getFPMethodOverridden(Class cls, String method,
+ FPMethodArgs methodArgs) {
+ HashMap map = null;
+ boolean initialized = methodsOverriddenMapRef != null
+ && (map = methodsOverriddenMapRef.get()) != null;
+
+ if (!initialized) {
+ map = new HashMap<>();
+ methodsOverriddenMapRef = new SoftReference<>(map);
+ }
+
+ FPMethodItem key = new FPMethodItem(cls, method);
+ Boolean isFPMethodOverridden = map.get(key);
+ if (isFPMethodOverridden == null) {
+ isFPMethodOverridden = checkFPMethodOverridden(cls, method, methodArgs);
+ map.put(key, isFPMethodOverridden);
+ }
+ return isFPMethodOverridden;
+ }
+
+ private static boolean checkFPMethodOverridden(final Class className,
+ final String methodName,
+ final FPMethodArgs methodArgs) {
+
+ return AccessController
+ .doPrivileged(new PrivilegedAction() {
+ @Override
+ public Boolean run() {
+ return isFPMethodOverridden(methodName, className,
+ methodArgs.getMethodArguments(false),
+ methodArgs.getMethodArguments(true));
+ }
+ });
+ }
+
+ private static boolean isFPMethodOverridden(String method,
+ Class cls,
+ Class[] intTypes,
+ Class[] fpTypes)
{
Module thisModule = PlainView.class.getModule();
while (!thisModule.equals(cls.getModule())) {
@@ -840,6 +877,57 @@
return true;
}
+ enum FPMethodArgs {
+
+ IGNN,
+ IIGNN,
+ GNNII,
+ GNNC;
+
+ public Class[] getMethodArguments(boolean isFPType) {
+ Class N = (isFPType) ? Float.TYPE : Integer.TYPE;
+ Class G = (isFPType) ? Graphics2D.class : Graphics.class;
+ switch (this) {
+ case IGNN:
+ return new Class[]{Integer.TYPE, G, N, N};
+ case IIGNN:
+ return new Class[]{Integer.TYPE, Integer.TYPE, G, N, N};
+ case GNNII:
+ return new Class[]{G, N, N, Integer.TYPE, Integer.TYPE};
+ case GNNC:
+ return new Class[]{G, N, N, Character.TYPE};
+ default:
+ throw new RuntimeException("Unknown method arguments!");
+ }
+ }
+ }
+
+ private static class FPMethodItem {
+
+ final Class className;
+ final String methodName;
+
+ public FPMethodItem(Class className, String methodName) {
+ this.className = className;
+ this.methodName = methodName;
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (obj instanceof FPMethodItem) {
+ FPMethodItem that = (FPMethodItem) obj;
+ return this.className.equals(that.className)
+ && this.methodName.equals(that.methodName);
+ }
+ return false;
+ }
+
+ @Override
+ public int hashCode() {
+ return 31 * methodName.hashCode() + className.hashCode();
+ }
+ }
+
// --- member variables -----------------------------------------------
/**
@@ -878,46 +966,13 @@
*/
int firstLineOffset;
- final boolean drawLineOverridden;
- final boolean drawSelectedTextOverridden;
- final boolean drawUnselectedTextOverridden;
- final boolean useFloatingPointAPI;
-
- {
- final Class CLS = getClass();
- final Class INT = Integer.TYPE;
- final Class FP = Float.TYPE;
-
- drawLineOverridden = AccessController
- .doPrivileged(new PrivilegedAction() {
- @Override
- public Boolean run() {
- Class[] intTypes = {INT, Graphics.class, INT, INT};
- Class[] fpTypes = {INT, Graphics2D.class, FP, FP};
- return isFPMethodOverriden("drawLine", CLS, intTypes, fpTypes);
- }
- });
-
- drawUnselectedTextOverridden = AccessController
- .doPrivileged(new PrivilegedAction() {
- @Override
- public Boolean run() {
- Class[] intTypes = {Graphics.class, INT, INT, INT, INT};
- Class[] fpTypes = {Graphics2D.class, FP, FP, INT, INT};
- return isFPMethodOverriden("drawUnselectedText", CLS, intTypes, fpTypes);
- }
- });
-
- drawSelectedTextOverridden = AccessController
- .doPrivileged(new PrivilegedAction() {
- @Override
- public Boolean run() {
- Class[] intTypes = {Graphics.class, INT, INT, INT, INT};
- Class[] fpTypes = {Graphics2D.class, FP, FP, INT, INT};
- return isFPMethodOverriden("drawSelectedText", CLS, intTypes, fpTypes);
- }
- });
-
- useFloatingPointAPI = drawUnselectedTextOverridden || drawSelectedTextOverridden;
- }
+ private static SoftReference> methodsOverriddenMapRef;
+ final boolean drawLineOverridden =
+ getFPMethodOverridden(getClass(), "drawLine", FPMethodArgs.IGNN);
+ final boolean drawSelectedTextOverridden =
+ getFPMethodOverridden(getClass(), "drawSelectedText", FPMethodArgs.GNNII);
+ final boolean drawUnselectedTextOverridden =
+ getFPMethodOverridden(getClass(), "drawUnselectedText", FPMethodArgs.GNNII);
+ final boolean useFloatingPointAPI =
+ drawUnselectedTextOverridden || drawSelectedTextOverridden;
}
diff -r be8643ebe865 -r 6665640c56cf jdk/src/java.desktop/share/classes/javax/swing/text/WrappedPlainView.java
--- a/jdk/src/java.desktop/share/classes/javax/swing/text/WrappedPlainView.java Fri Jan 13 01:36:02 2017 +0000
+++ b/jdk/src/java.desktop/share/classes/javax/swing/text/WrappedPlainView.java Wed Jul 05 22:41:30 2017 +0200
@@ -28,10 +28,9 @@
import java.awt.font.FontRenderContext;
import java.awt.geom.Rectangle2D;
import java.lang.ref.SoftReference;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
import javax.swing.event.*;
-import static javax.swing.text.PlainView.isFPMethodOverriden;
+import static javax.swing.text.PlainView.FPMethodArgs.*;
+import static javax.swing.text.PlainView.getFPMethodOverridden;
/**
* View of plain text (text with only one font and color)
@@ -989,46 +988,12 @@
SoftReference lineCache = null;
}
- private final boolean drawLineOverridden;
- private final boolean drawSelectedTextOverridden;
- private final boolean drawUnselectedTextOverridden;
- private final boolean useFloatingPointAPI;
-
- {
- final Class CLS = getClass();
- final Class INT = Integer.TYPE;
- final Class FP = Float.TYPE;
-
- drawLineOverridden = AccessController
- .doPrivileged(new PrivilegedAction() {
- @Override
- public Boolean run() {
- Class[] intTypes = {INT, INT, Graphics.class, INT, INT};
- Class[] fpTypes = {INT, INT, Graphics2D.class, FP, FP};
- return isFPMethodOverriden("drawLine", CLS, intTypes, fpTypes);
- }
- });
-
- drawUnselectedTextOverridden = AccessController
- .doPrivileged(new PrivilegedAction() {
- @Override
- public Boolean run() {
- Class[] intTypes = {Graphics.class, INT, INT, INT, INT};
- Class[] fpTypes = {Graphics2D.class, FP, FP, INT, INT};
- return isFPMethodOverriden("drawUnselectedText", CLS, intTypes, fpTypes);
- }
- });
-
- drawSelectedTextOverridden = AccessController
- .doPrivileged(new PrivilegedAction() {
- @Override
- public Boolean run() {
- Class[] intTypes = {Graphics.class, INT, INT, INT, INT};
- Class[] fpTypes = {Graphics2D.class, FP, FP, INT, INT};
- return isFPMethodOverriden("drawSelectedText", CLS, intTypes, fpTypes);
- }
- });
-
- useFloatingPointAPI = drawUnselectedTextOverridden || drawSelectedTextOverridden;
- }
+ private final boolean drawLineOverridden =
+ getFPMethodOverridden(getClass(), "drawLine", IIGNN);
+ private final boolean drawSelectedTextOverridden =
+ getFPMethodOverridden(getClass(), "drawSelectedText", GNNII);
+ private final boolean drawUnselectedTextOverridden =
+ getFPMethodOverridden(getClass(), "drawUnselectedText", GNNII);
+ private final boolean useFloatingPointAPI =
+ drawUnselectedTextOverridden || drawSelectedTextOverridden;
}
diff -r be8643ebe865 -r 6665640c56cf jdk/src/java.desktop/share/classes/sun/applet/AppletEvent.java
--- a/jdk/src/java.desktop/share/classes/sun/applet/AppletEvent.java Fri Jan 13 01:36:02 2017 +0000
+++ b/jdk/src/java.desktop/share/classes/sun/applet/AppletEvent.java Wed Jul 05 22:41:30 2017 +0200
@@ -32,8 +32,13 @@
* AppletEvent class.
*
* @author Sunita Mani
+ *
+ * @deprecated The Applet API is deprecated. See the
+ * java.applet package
+ * documentation for further information.
*/
@SuppressWarnings("serial") // JDK-implementation class
+@Deprecated(since = "9")
public class AppletEvent extends EventObject {
private Object arg;
diff -r be8643ebe865 -r 6665640c56cf jdk/src/java.desktop/share/classes/sun/applet/AppletEventMulticaster.java
--- a/jdk/src/java.desktop/share/classes/sun/applet/AppletEventMulticaster.java Fri Jan 13 01:36:02 2017 +0000
+++ b/jdk/src/java.desktop/share/classes/sun/applet/AppletEventMulticaster.java Wed Jul 05 22:41:30 2017 +0200
@@ -36,7 +36,12 @@
* responsible for dispatching events to them.
*
* @author Sunita Mani
+ *
+ * @deprecated The Applet API is deprecated. See the
+ * java.applet package
+ * documentation for further information.
*/
+@Deprecated(since = "9")
public class AppletEventMulticaster implements AppletListener {
private final AppletListener a, b;
diff -r be8643ebe865 -r 6665640c56cf jdk/src/java.desktop/share/classes/sun/applet/AppletIOException.java
--- a/jdk/src/java.desktop/share/classes/sun/applet/AppletIOException.java Fri Jan 13 01:36:02 2017 +0000
+++ b/jdk/src/java.desktop/share/classes/sun/applet/AppletIOException.java Wed Jul 05 22:41:30 2017 +0200
@@ -31,10 +31,14 @@
* An applet IO exception.
*
* @author Koji Uno
+ *
+ * @deprecated The Applet API is deprecated. See the
+ * java.applet package
+ * documentation for further information.
*/
@SuppressWarnings("serial") // JDK implementation class
-public
-class AppletIOException extends IOException {
+@Deprecated(since = "9")
+public class AppletIOException extends IOException {
private String key = null;
private Object msgobj = null;
diff -r be8643ebe865 -r 6665640c56cf jdk/src/java.desktop/share/classes/sun/applet/AppletIllegalArgumentException.java
--- a/jdk/src/java.desktop/share/classes/sun/applet/AppletIllegalArgumentException.java Fri Jan 13 01:36:02 2017 +0000
+++ b/jdk/src/java.desktop/share/classes/sun/applet/AppletIllegalArgumentException.java Wed Jul 05 22:41:30 2017 +0200
@@ -29,10 +29,14 @@
* An applet security exception.
*
* @author Arthur van Hoff
+ *
+ * @deprecated The Applet API is deprecated. See the
+ * java.applet package
+ * documentation for further information.
*/
@SuppressWarnings("serial") // JDK implementation class
-public
-class AppletIllegalArgumentException extends IllegalArgumentException {
+@Deprecated(since = "9")
+public class AppletIllegalArgumentException extends IllegalArgumentException {
private String key = null;
public AppletIllegalArgumentException(String key) {
diff -r be8643ebe865 -r 6665640c56cf jdk/src/java.desktop/share/classes/sun/applet/AppletImageRef.java
--- a/jdk/src/java.desktop/share/classes/sun/applet/AppletImageRef.java Fri Jan 13 01:36:02 2017 +0000
+++ b/jdk/src/java.desktop/share/classes/sun/applet/AppletImageRef.java Wed Jul 05 22:41:30 2017 +0200
@@ -31,6 +31,7 @@
import sun.awt.image.URLImageSource;
import java.net.URL;
+@Deprecated(since = "9")
class AppletImageRef {
private SoftReference soft = null;
diff -r be8643ebe865 -r 6665640c56cf jdk/src/java.desktop/share/classes/sun/applet/AppletListener.java
--- a/jdk/src/java.desktop/share/classes/sun/applet/AppletListener.java Fri Jan 13 01:36:02 2017 +0000
+++ b/jdk/src/java.desktop/share/classes/sun/applet/AppletListener.java Wed Jul 05 22:41:30 2017 +0200
@@ -32,8 +32,12 @@
* by objects interested in AppletEvents.
*
* @author Sunita Mani
+ *
+ * @deprecated The Applet API is deprecated. See the
+ * java.applet package
+ * documentation for further information.
*/
-
+@Deprecated(since = "9")
public interface AppletListener extends EventListener {
public void appletStateChanged(AppletEvent e);
}
diff -r be8643ebe865 -r 6665640c56cf jdk/src/java.desktop/share/classes/sun/applet/AppletObjectInputStream.java
--- a/jdk/src/java.desktop/share/classes/sun/applet/AppletObjectInputStream.java Fri Jan 13 01:36:02 2017 +0000
+++ b/jdk/src/java.desktop/share/classes/sun/applet/AppletObjectInputStream.java Wed Jul 05 22:41:30 2017 +0200
@@ -34,8 +34,12 @@
/**
* This subclass of ObjectInputStream delegates loading of classes to
* an existing ClassLoader.
+ *
+ * @deprecated The Applet API is deprecated. See the
+ * java.applet package
+ * documentation for further information.
*/
-
+@Deprecated(since = "9")
class AppletObjectInputStream extends ObjectInputStream
{
private AppletClassLoader loader;
diff -r be8643ebe865 -r 6665640c56cf jdk/src/java.desktop/share/classes/sun/applet/AppletPanel.java
--- a/jdk/src/java.desktop/share/classes/sun/applet/AppletPanel.java Fri Jan 13 01:36:02 2017 +0000
+++ b/jdk/src/java.desktop/share/classes/sun/applet/AppletPanel.java Wed Jul 05 22:41:30 2017 +0200
@@ -52,9 +52,14 @@
* thread group to call the applet's init(), start(), stop(), and
* destroy() methods.
*
+ * @deprecated The Applet API is deprecated. See the
+ * java.applet package
+ * documentation for further information.
+ *
* @author Arthur van Hoff
*/
-@SuppressWarnings({"serial", "deprecation"}) // JDK implementation class
+@SuppressWarnings({"serial"}) // JDK implementation class
+@Deprecated(since = "9")
public
abstract class AppletPanel extends Panel implements AppletStub, Runnable {
diff -r be8643ebe865 -r 6665640c56cf jdk/src/java.desktop/share/classes/sun/applet/AppletProps.java
--- a/jdk/src/java.desktop/share/classes/sun/applet/AppletProps.java Fri Jan 13 01:36:02 2017 +0000
+++ b/jdk/src/java.desktop/share/classes/sun/applet/AppletProps.java Wed Jul 05 22:41:30 2017 +0200
@@ -36,6 +36,7 @@
import sun.security.action.*;
@SuppressWarnings("serial") // JDK implementation class
+@Deprecated(since = "9")
class AppletProps extends Frame {
TextField proxyHost;
@@ -197,6 +198,7 @@
/* 4066432 */
/* Dialog class to display property-related errors to user */
@SuppressWarnings("serial") // JDK implementation class
+@Deprecated(since = "9")
class AppletPropsErrorDialog extends Dialog {
@SuppressWarnings("deprecation")
public AppletPropsErrorDialog(Frame parent, String title, String message,
diff -r be8643ebe865 -r 6665640c56cf jdk/src/java.desktop/share/classes/sun/applet/AppletViewer.java
--- a/jdk/src/java.desktop/share/classes/sun/applet/AppletViewer.java Fri Jan 13 01:36:02 2017 +0000
+++ b/jdk/src/java.desktop/share/classes/sun/applet/AppletViewer.java Wed Jul 05 22:41:30 2017 +0200
@@ -43,6 +43,7 @@
* A frame to show the applet tag in.
*/
@SuppressWarnings("serial") // JDK-implementation class
+@Deprecated(since = "9")
final class TextFrame extends Frame {
/**
@@ -91,6 +92,7 @@
/**
* Lets us construct one using unix-style one shot behaviors.
*/
+@Deprecated(since = "9")
final class StdAppletViewerFactory implements AppletViewerFactory {
@Override
@@ -116,8 +118,13 @@
* AppletViewer Tags.
* (The document named appletviewertags.html in the JDK's docs/tooldocs directory,
* once the JDK docs have been installed.)
+ *
+ * @deprecated The Applet API is deprecated. See the
+ * java.applet package
+ * documentation for further information.
*/
-@SuppressWarnings({"serial", "deprecation"}) // JDK-implementation class
+@SuppressWarnings({"serial"}) // JDK-implementation class
+@Deprecated(since = "9")
public class AppletViewer extends Frame implements AppletContext, Printable {
/**
@@ -146,7 +153,7 @@
*/
AppletViewerFactory factory;
-
+ @Deprecated(since = "9")
private final class UserActionListener implements ActionListener {
@Override
public void actionPerformed(ActionEvent evt) {
@@ -219,6 +226,7 @@
}
};
+ @Deprecated(since = "9")
class AppletEventListener implements AppletListener
{
final Frame frame;
diff -r be8643ebe865 -r 6665640c56cf jdk/src/java.desktop/share/classes/sun/applet/AppletViewerFactory.java
--- a/jdk/src/java.desktop/share/classes/sun/applet/AppletViewerFactory.java Fri Jan 13 01:36:02 2017 +0000
+++ b/jdk/src/java.desktop/share/classes/sun/applet/AppletViewerFactory.java Wed Jul 05 22:41:30 2017 +0200
@@ -33,8 +33,8 @@
import java.net.URL;
import java.awt.MenuBar;
-public
-interface AppletViewerFactory {
+@Deprecated(since = "9")
+public interface AppletViewerFactory {
public AppletViewer createAppletViewer(int x, int y, URL doc,
Hashtable atts);
public MenuBar getBaseMenuBar();
diff -r be8643ebe865 -r 6665640c56cf jdk/src/java.desktop/share/classes/sun/applet/AppletViewerPanel.java
--- a/jdk/src/java.desktop/share/classes/sun/applet/AppletViewerPanel.java Fri Jan 13 01:36:02 2017 +0000
+++ b/jdk/src/java.desktop/share/classes/sun/applet/AppletViewerPanel.java Wed Jul 05 22:41:30 2017 +0200
@@ -40,7 +40,12 @@
* destroy() methods.
*
* @author Arthur van Hoff
+ *
+ * @deprecated The Applet API is deprecated. See the
+ * java.applet package
+ * documentation for further information.
*/
+@Deprecated(since = "9")
class AppletViewerPanel extends AppletPanel {
/* Are we debugging? */
diff -r be8643ebe865 -r 6665640c56cf jdk/src/java.desktop/share/classes/sun/applet/Main.java
--- a/jdk/src/java.desktop/share/classes/sun/applet/Main.java Fri Jan 13 01:36:02 2017 +0000
+++ b/jdk/src/java.desktop/share/classes/sun/applet/Main.java Wed Jul 05 22:41:30 2017 +0200
@@ -39,7 +39,12 @@
/**
* The main entry point into AppletViewer.
+ *
+ * @deprecated The Applet API is deprecated. See the
+ * java.applet package
+ * documentation for further information.
*/
+@Deprecated(since = "9")
public class Main {
/**
* The file which contains all of the AppletViewer specific properties.
diff -r be8643ebe865 -r 6665640c56cf jdk/src/java.desktop/share/classes/sun/awt/EmbeddedFrame.java
--- a/jdk/src/java.desktop/share/classes/sun/awt/EmbeddedFrame.java Fri Jan 13 01:36:02 2017 +0000
+++ b/jdk/src/java.desktop/share/classes/sun/awt/EmbeddedFrame.java Wed Jul 05 22:41:30 2017 +0200
@@ -496,10 +496,14 @@
* Checks if the component is in an EmbeddedFrame. If so,
* returns the applet found in the hierarchy or null if
* not found.
- * @return the parent applet or {@ null}
+ * @return the parent applet or {@code null}
* @since 1.6
+ *
+ * @deprecated The Applet API is deprecated. See the
+ * java.applet package
+ * documentation for further information.
*/
- @SuppressWarnings("deprecation")
+ @Deprecated(since = "9")
public static Applet getAppletIfAncestorOf(Component comp) {
Container parent = comp.getParent();
Applet applet = null;
diff -r be8643ebe865 -r 6665640c56cf jdk/src/java.desktop/share/native/libawt/awt/medialib/awt_ImagingLib.c
--- a/jdk/src/java.desktop/share/native/libawt/awt/medialib/awt_ImagingLib.c Fri Jan 13 01:36:02 2017 +0000
+++ b/jdk/src/java.desktop/share/native/libawt/awt/medialib/awt_ImagingLib.c Wed Jul 05 22:41:30 2017 +0200
@@ -2419,7 +2419,7 @@
case sun_awt_image_IntegerComponentRaster_TYPE_INT_8BIT_SAMPLES:
if (!((rasterP->chanOffsets[0] == 0 || SAFE_TO_ALLOC_2(rasterP->chanOffsets[0], 4)) &&
SAFE_TO_ALLOC_2(width, 4) &&
- SAFE_TO_ALLOC_3(height, rasterP->scanlineStride, 4)))
+ SAFE_TO_ALLOC_3(rasterP->scanlineStride, height, 4)))
{
return -1;
}
@@ -2428,7 +2428,7 @@
if (offset < 0 || offset >= dataSize ||
width > rasterP->scanlineStride ||
- height * rasterP->scanlineStride * 4 > dataSize - offset)
+ ((width + (height - 1) * rasterP->scanlineStride) * 4) > dataSize - offset)
{
// raster data buffer is too short
return -1;
@@ -2446,7 +2446,7 @@
return 0;
case sun_awt_image_IntegerComponentRaster_TYPE_BYTE_SAMPLES:
if (!(SAFE_TO_ALLOC_2(width, rasterP->numBands) &&
- SAFE_TO_ALLOC_2(height, rasterP->scanlineStride)))
+ SAFE_TO_ALLOC_2(rasterP->scanlineStride, height)))
{
return -1;
}
@@ -2455,7 +2455,8 @@
if (offset < 0 || offset >= dataSize ||
width * rasterP->numBands > rasterP->scanlineStride ||
- height * rasterP->scanlineStride > dataSize - offset)
+ ((width * rasterP->numBands) +
+ (height - 1) * rasterP->scanlineStride) > dataSize - offset)
{
// raster data buffer is too short
return -1;
@@ -2474,7 +2475,7 @@
case sun_awt_image_IntegerComponentRaster_TYPE_USHORT_SAMPLES:
if (!((rasterP->chanOffsets[0] == 0 || SAFE_TO_ALLOC_2(rasterP->chanOffsets[0], 2)) &&
SAFE_TO_ALLOC_3(width, rasterP->numBands, 2) &&
- SAFE_TO_ALLOC_3(height, rasterP->scanlineStride, 2)))
+ SAFE_TO_ALLOC_3(rasterP->scanlineStride, height, 2)))
{
return -1;
}
@@ -2483,7 +2484,8 @@
if (offset < 0 || offset >= dataSize ||
width * rasterP->numBands > rasterP->scanlineStride ||
- height * rasterP->scanlineStride * 2 > dataSize - offset)
+ (((width * rasterP->numBands) +
+ (height - 1) * rasterP->scanlineStride)) * 2 > dataSize - offset)
{
// raster data buffer is too short
return -1;
diff -r be8643ebe865 -r 6665640c56cf jdk/src/java.desktop/share/native/libmlib_image/safe_alloc.h
--- a/jdk/src/java.desktop/share/native/libmlib_image/safe_alloc.h Fri Jan 13 01:36:02 2017 +0000
+++ b/jdk/src/java.desktop/share/native/libmlib_image/safe_alloc.h Wed Jul 05 22:41:30 2017 +0200
@@ -35,10 +35,10 @@
*/
#define SAFE_TO_ALLOC_2(c, sz) \
(((c) > 0) && ((sz) > 0) && \
- ((0xffffffffu / ((juint)(c))) > ((juint)(sz))))
+ ((0x7fffffff / (c)) > (sz)))
#define SAFE_TO_ALLOC_3(w, h, sz) \
(((w) > 0) && ((h) > 0) && ((sz) > 0) && \
- (((0xffffffffu / ((juint)(w))) / ((juint)(h))) > ((juint)(sz))))
+ (((0x7fffffff / (w)) / (h)) > (sz)))
#endif // __SAFE_ALLOC_H__
diff -r be8643ebe865 -r 6665640c56cf jdk/src/java.desktop/unix/classes/sun/awt/X11/XDecoratedPeer.java
--- a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XDecoratedPeer.java Fri Jan 13 01:36:02 2017 +0000
+++ b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XDecoratedPeer.java Wed Jul 05 22:41:30 2017 +0200
@@ -51,9 +51,9 @@
boolean insets_corrected;
XIconWindow iconWindow;
- WindowDimensions dimensions;
+ volatile WindowDimensions dimensions;
XContentWindow content;
- Insets currentInsets;
+ volatile Insets currentInsets;
XFocusProxyWindow focusProxy;
static final Map,Insets> lastKnownInsets =
Collections.synchronizedMap(new HashMap<>());
@@ -106,7 +106,7 @@
// The lines that follow need to be in a postInit, so they
// happen after the X window is created.
- initResizability();
+ setResizable(winAttr.initialResizability);
XWM.requestWMExtents(getWindow());
content = XContentWindow.createContent(this);
@@ -130,7 +130,12 @@
public void updateMinimumSize() {
super.updateMinimumSize();
- updateMinSizeHints();
+ XToolkit.awtLock();
+ try {
+ updateMinSizeHints();
+ } finally {
+ XToolkit.awtUnlock();
+ }
}
private void updateMinSizeHints() {
@@ -193,8 +198,13 @@
if (log.isLoggable(PlatformLogger.Level.FINE)) {
log.fine("Title is " + title);
}
- winAttr.title = title;
- updateWMName();
+ XToolkit.awtLock();
+ try {
+ winAttr.title = title;
+ updateWMName();
+ } finally {
+ XToolkit.awtUnlock();
+ }
}
protected String getWMName() {
@@ -206,10 +216,10 @@
}
void updateWMName() {
- super.updateWMName();
- String name = getWMName();
XToolkit.awtLock();
try {
+ super.updateWMName();
+ String name = getWMName();
if (name == null || name.trim().equals("")) {
name = "Java";
}
@@ -304,6 +314,8 @@
if (XWM.getWMID() != XWM.UNITY_COMPIZ_WM) {
currentInsets = new Insets(0, 0, 0, 0);
wm_set_insets = null;
+ } else {
+ insets_corrected = false;
}
}
@@ -330,7 +342,7 @@
if (XWM.getWMID() != XWM.UNITY_COMPIZ_WM) {
getWMSetInsets(XAtom.get(ev.get_atom()));
} else {
- if(!isReparented()) {
+ if (!isReparented()) {
return;
}
wm_set_insets = null;
@@ -377,137 +389,127 @@
insLog.fine(xe.toString());
}
reparent_serial = xe.get_serial();
- XToolkit.awtLock();
- try {
- long root = XlibWrapper.RootWindow(XToolkit.getDisplay(), getScreenNumber());
+ long root = XlibWrapper.RootWindow(XToolkit.getDisplay(), getScreenNumber());
+
+ if (isEmbedded()) {
+ setReparented(true);
+ insets_corrected = true;
+ return;
+ }
+ if (getDecorations() == XWindowAttributesData.AWT_DECOR_NONE) {
+ setReparented(true);
+ insets_corrected = true;
+ reshape(dimensions, SET_SIZE, false);
+ } else if (xe.get_parent() == root) {
+ configure_seen = false;
+ insets_corrected = false;
- if (isEmbedded()) {
- setReparented(true);
- insets_corrected = true;
+ /*
+ * We can be repareted to root for two reasons:
+ * . setVisible(false)
+ * . WM exited
+ */
+ if (isVisible()) { /* WM exited */
+ /* Work around 4775545 */
+ XWM.getWM().unshadeKludge(this);
+ insLog.fine("- WM exited");
+ } else {
+ insLog.fine(" - reparent due to hide");
+ }
+ } else { /* reparented to WM frame, figure out our insets */
+ setReparented(true);
+ insets_corrected = false;
+ if (XWM.getWMID() == XWM.UNITY_COMPIZ_WM) {
return;
}
- Component t = target;
- if (getDecorations() == XWindowAttributesData.AWT_DECOR_NONE) {
- setReparented(true);
- insets_corrected = true;
- reshape(dimensions, SET_SIZE, false);
- } else if (xe.get_parent() == root) {
- configure_seen = false;
- insets_corrected = false;
- /*
- * We can be repareted to root for two reasons:
- * . setVisible(false)
- * . WM exited
- */
- if (isVisible()) { /* WM exited */
- /* Work around 4775545 */
- XWM.getWM().unshadeKludge(this);
- insLog.fine("- WM exited");
- } else {
- insLog.fine(" - reparent due to hide");
+ // Check if we have insets provided by the WM
+ Insets correctWM = getWMSetInsets(null);
+ if (correctWM != null) {
+ if (insLog.isLoggable(PlatformLogger.Level.FINER)) {
+ insLog.finer("wm-provided insets {0}", correctWM);
}
- } else { /* reparented to WM frame, figure out our insets */
- setReparented(true);
- insets_corrected = false;
- if (XWM.getWMID() == XWM.UNITY_COMPIZ_WM) {
+ // If these insets are equal to our current insets - no actions are necessary
+ Insets dimInsets = dimensions.getInsets();
+ if (correctWM.equals(dimInsets)) {
+ insLog.finer("Insets are the same as estimated - no additional reshapes necessary");
+ no_reparent_artifacts = true;
+ insets_corrected = true;
+ applyGuessedInsets();
return;
}
+ } else {
+ correctWM = XWM.getWM().getInsets(this, xe.get_window(), xe.get_parent());
+ if (correctWM != null) {
+ correctWM = copyAndScaleDown(correctWM);
+ }
- // Check if we have insets provided by the WM
- Insets correctWM = getWMSetInsets(null);
- if (correctWM != null) {
- if (insLog.isLoggable(PlatformLogger.Level.FINER)) {
- insLog.finer("wm-provided insets {0}", correctWM);
- }
- // If these insets are equal to our current insets - no actions are necessary
- Insets dimInsets = dimensions.getInsets();
- if (correctWM.equals(dimInsets)) {
- insLog.finer("Insets are the same as estimated - no additional reshapes necessary");
- no_reparent_artifacts = true;
- insets_corrected = true;
- applyGuessedInsets();
- return;
- }
- } else {
- correctWM = XWM.getWM().getInsets(this, xe.get_window(), xe.get_parent());
+ if (insLog.isLoggable(PlatformLogger.Level.FINER)) {
if (correctWM != null) {
- correctWM = copyAndScaleDown(correctWM);
- }
-
- if (insLog.isLoggable(PlatformLogger.Level.FINER)) {
- if (correctWM != null) {
- insLog.finer("correctWM {0}", correctWM);
- } else {
- insLog.finer("correctWM insets are not available, waiting for configureNotify");
- }
+ insLog.finer("correctWM {0}", correctWM);
+ } else {
+ insLog.finer("correctWM insets are not available, waiting for configureNotify");
}
}
+ }
- if (correctWM != null) {
- handleCorrectInsets(correctWM);
- }
+ if (correctWM != null) {
+ handleCorrectInsets(correctWM);
}
- } finally {
- XToolkit.awtUnlock();
}
}
- protected void handleCorrectInsets(Insets correctWM) {
- XToolkit.awtLock();
- try {
- /*
- * Ok, now see if we need adjust window size because
- * initial insets were wrong (most likely they were).
- */
- Insets correction = difference(correctWM, currentInsets);
- if (insLog.isLoggable(PlatformLogger.Level.FINEST)) {
- insLog.finest("Corrention {0}", correction);
- }
- if (!isNull(correction)) {
- currentInsets = copy(correctWM);
- applyGuessedInsets();
+ private void handleCorrectInsets(Insets correctWM) {
+ /*
+ * Ok, now see if we need adjust window size because
+ * initial insets were wrong (most likely they were).
+ */
+ Insets correction = difference(correctWM, currentInsets);
+ if (insLog.isLoggable(PlatformLogger.Level.FINEST)) {
+ insLog.finest("Corrention {0}", correction);
+ }
+ if (!isNull(correction)) {
+ currentInsets = copy(correctWM);
+ applyGuessedInsets();
- //Fix for 6318109: PIT: Min Size is not honored properly when a
- //smaller size is specified in setSize(), XToolkit
- //update minimum size hints
- updateMinSizeHints();
- }
- if (insLog.isLoggable(PlatformLogger.Level.FINER)) {
- insLog.finer("Dimensions before reparent: " + dimensions);
- }
-
- dimensions.setInsets(getRealInsets());
- insets_corrected = true;
+ //Fix for 6318109: PIT: Min Size is not honored properly when a
+ //smaller size is specified in setSize(), XToolkit
+ //update minimum size hints
+ updateMinSizeHints();
+ }
+ if (insLog.isLoggable(PlatformLogger.Level.FINER)) {
+ insLog.finer("Dimensions before reparent: " + dimensions);
+ }
+ WindowDimensions newDimensions = new WindowDimensions(dimensions);
+ newDimensions.setInsets(getRealInsets());
+ dimensions = newDimensions;
+ insets_corrected = true;
- if (isMaximized()) {
- return;
- }
+ if (isMaximized()) {
+ return;
+ }
- /*
- * If this window has been sized by a pack() we need
- * to keep the interior geometry intact. Since pack()
- * computed width and height with wrong insets, we
- * must adjust the target dimensions appropriately.
- */
- if ((getHints().get_flags() & (XUtilConstants.USPosition | XUtilConstants.PPosition)) != 0) {
- reshape(dimensions, SET_BOUNDS, false);
- } else {
- reshape(dimensions, SET_SIZE, false);
- }
- } finally {
- XToolkit.awtUnlock();
+ /*
+ * If this window has been sized by a pack() we need
+ * to keep the interior geometry intact. Since pack()
+ * computed width and height with wrong insets, we
+ * must adjust the target dimensions appropriately.
+ */
+ if ((getHints().get_flags() & (XUtilConstants.USPosition | XUtilConstants.PPosition)) != 0) {
+ reshape(dimensions, SET_BOUNDS, false);
+ } else {
+ reshape(dimensions, SET_SIZE, false);
}
}
- public void handleMoved(WindowDimensions dims) {
+ void handleMoved(WindowDimensions dims) {
Point loc = dims.getLocation();
AWTAccessor.getComponentAccessor().setLocation(target, loc.x, loc.y);
postEvent(new ComponentEvent(target, ComponentEvent.COMPONENT_MOVED));
}
- protected Insets guessInsets() {
+ private Insets guessInsets() {
if (isEmbedded() || isTargetUndecorated()) {
return new Insets(0, 0, 0, 0);
} else {
@@ -532,16 +534,7 @@
currentInsets = copy(guessed);
}
- public void revalidate() {
- XToolkit.executeOnEventHandlerThread(target, new Runnable() {
- public void run() {
- target.invalidate();
- target.validate();
- }
- });
- }
-
- Insets getRealInsets() {
+ private Insets getRealInsets() {
if (isNull(currentInsets)) {
applyGuessedInsets();
}
@@ -578,7 +571,7 @@
// Coordinates are that of the target
// Called only on Toolkit thread
- public void reshape(WindowDimensions newDimensions, int op,
+ private void reshape(WindowDimensions newDimensions, int op,
boolean userReshape)
{
if (insLog.isLoggable(PlatformLogger.Level.FINE)) {
@@ -599,81 +592,75 @@
}
newDimensions = new WindowDimensions(newBounds, insets, newDimensions.isClientSizeSet());
}
- XToolkit.awtLock();
- try {
- if (!isReparented() || !isVisible()) {
- if (insLog.isLoggable(PlatformLogger.Level.FINE)) {
- insLog.fine("- not reparented({0}) or not visible({1}), default reshape",
- Boolean.valueOf(isReparented()), Boolean.valueOf(visible));
- }
-
- // Fix for 6323293.
- // This actually is needed to preserve compatibility with previous releases -
- // some of licensees are expecting componentMoved event on invisible one while
- // its location changes.
- Point oldLocation = getLocation();
+ if (!isReparented() || !isVisible()) {
+ if (insLog.isLoggable(PlatformLogger.Level.FINE)) {
+ insLog.fine("- not reparented({0}) or not visible({1}), default reshape",
+ Boolean.valueOf(isReparented()), Boolean.valueOf(visible));
+ }
- Point newLocation = new Point(AWTAccessor.getComponentAccessor().getX(target),
- AWTAccessor.getComponentAccessor().getY(target));
-
- if (!newLocation.equals(oldLocation)) {
- handleMoved(newDimensions);
- }
+ // Fix for 6323293.
+ // This actually is needed to preserve compatibility with previous releases -
+ // some of licensees are expecting componentMoved event on invisible one while
+ // its location changes.
+ Point oldLocation = getLocation();
- dimensions = new WindowDimensions(newDimensions);
- updateSizeHints(dimensions);
- Rectangle client = dimensions.getClientRect();
- checkShellRect(client);
- setShellBounds(client);
- if (content != null &&
- !content.getSize().equals(newDimensions.getSize()))
- {
- reconfigureContentWindow(newDimensions);
- }
- return;
+ Point newLocation = new Point(AWTAccessor.getComponentAccessor().getX(target),
+ AWTAccessor.getComponentAccessor().getY(target));
+
+ if (!newLocation.equals(oldLocation)) {
+ handleMoved(newDimensions);
}
- int wm = XWM.getWMID();
- updateChildrenSizes();
- applyGuessedInsets();
-
- Rectangle shellRect = newDimensions.getClientRect();
-
- if (gravityBug()) {
- Insets in = newDimensions.getInsets();
- shellRect.translate(in.left, in.top);
+ dimensions = new WindowDimensions(newDimensions);
+ updateSizeHints(dimensions);
+ Rectangle client = dimensions.getClientRect();
+ checkShellRect(client);
+ setShellBounds(client);
+ if (content != null &&
+ !content.getSize().equals(newDimensions.getSize()))
+ {
+ reconfigureContentWindow(newDimensions);
}
+ return;
+ }
- if ((op & NO_EMBEDDED_CHECK) == 0 && isEmbedded()) {
- shellRect.setLocation(0, 0);
- }
+ updateChildrenSizes();
+ applyGuessedInsets();
- checkShellRectSize(shellRect);
- if (!isEmbedded()) {
- checkShellRectPos(shellRect);
- }
+ Rectangle shellRect = newDimensions.getClientRect();
+
+ if (gravityBug()) {
+ Insets in = newDimensions.getInsets();
+ shellRect.translate(in.left, in.top);
+ }
- op = op & ~NO_EMBEDDED_CHECK;
+ if ((op & NO_EMBEDDED_CHECK) == 0 && isEmbedded()) {
+ shellRect.setLocation(0, 0);
+ }
- if (op == SET_LOCATION) {
- setShellPosition(shellRect);
- } else if (isResizable()) {
- if (op == SET_BOUNDS) {
- setShellBounds(shellRect);
- } else {
- setShellSize(shellRect);
- }
+ checkShellRectSize(shellRect);
+ if (!isEmbedded()) {
+ checkShellRectPos(shellRect);
+ }
+
+ op = op & ~NO_EMBEDDED_CHECK;
+
+ if (op == SET_LOCATION) {
+ setShellPosition(shellRect);
+ } else if (isResizable()) {
+ if (op == SET_BOUNDS) {
+ setShellBounds(shellRect);
} else {
- XWM.setShellNotResizable(this, newDimensions, shellRect, true);
- if (op == SET_BOUNDS) {
- setShellPosition(shellRect);
- }
+ setShellSize(shellRect);
}
+ } else {
+ XWM.setShellNotResizable(this, newDimensions, shellRect, true);
+ if (op == SET_BOUNDS) {
+ setShellPosition(shellRect);
+ }
+ }
- reconfigureContentWindow(newDimensions);
- } finally {
- XToolkit.awtUnlock();
- }
+ reconfigureContentWindow(newDimensions);
}
/**
@@ -682,8 +669,6 @@
private void reshape(int x, int y, int width, int height, int operation,
boolean userReshape)
{
- Rectangle newRec;
- boolean setClient = false;
WindowDimensions dims = new WindowDimensions(dimensions);
switch (operation & (~NO_EMBEDDED_CHECK)) {
case SET_LOCATION:
@@ -726,7 +711,12 @@
*/
public void setBounds(int x, int y, int width, int height, int op) {
// TODO: Rewrite with WindowDimensions
- reshape(x, y, width, height, op, true);
+ XToolkit.awtLock();
+ try {
+ reshape(x, y, width, height, op, true);
+ } finally {
+ XToolkit.awtUnlock();
+ }
validateSurface();
}
@@ -861,81 +851,74 @@
checkShellRectPos(shellRect);
}
- public void setShellBounds(Rectangle rec) {
+ private void setShellBounds(Rectangle rec) {
if (insLog.isLoggable(PlatformLogger.Level.FINE)) {
insLog.fine("Setting shell bounds on " + this + " to " + rec);
}
- XToolkit.awtLock();
- try {
- updateSizeHints(rec.x, rec.y, rec.width, rec.height);
- XlibWrapper.XMoveResizeWindow(XToolkit.getDisplay(), getShell(),
- scaleUp(rec.x), scaleUp(rec.y),
- scaleUp(rec.width), scaleUp(rec.height));
- }
- finally {
- XToolkit.awtUnlock();
- }
+ updateSizeHints(rec.x, rec.y, rec.width, rec.height);
+ XlibWrapper.XMoveResizeWindow(XToolkit.getDisplay(), getShell(),
+ scaleUp(rec.x), scaleUp(rec.y),
+ scaleUp(rec.width), scaleUp(rec.height));
}
- public void setShellSize(Rectangle rec) {
+
+ private void setShellSize(Rectangle rec) {
if (insLog.isLoggable(PlatformLogger.Level.FINE)) {
insLog.fine("Setting shell size on " + this + " to " + rec);
}
- XToolkit.awtLock();
- try {
- updateSizeHints(rec.x, rec.y, rec.width, rec.height);
- XlibWrapper.XResizeWindow(XToolkit.getDisplay(), getShell(),
- scaleUp(rec.width), scaleUp(rec.height));
- }
- finally {
- XToolkit.awtUnlock();
- }
+ updateSizeHints(rec.x, rec.y, rec.width, rec.height);
+ XlibWrapper.XResizeWindow(XToolkit.getDisplay(), getShell(),
+ scaleUp(rec.width), scaleUp(rec.height));
}
- public void setShellPosition(Rectangle rec) {
+
+ private void setShellPosition(Rectangle rec) {
if (insLog.isLoggable(PlatformLogger.Level.FINE)) {
insLog.fine("Setting shell position on " + this + " to " + rec);
}
- XToolkit.awtLock();
- try {
- updateSizeHints(rec.x, rec.y, rec.width, rec.height);
- XlibWrapper.XMoveWindow(XToolkit.getDisplay(), getShell(),
- scaleUp(rec.x), scaleUp(rec.y));
- }
- finally {
- XToolkit.awtUnlock();
- }
+ updateSizeHints(rec.x, rec.y, rec.width, rec.height);
+ XlibWrapper.XMoveWindow(XToolkit.getDisplay(), getShell(),
+ scaleUp(rec.x), scaleUp(rec.y));
}
- void initResizability() {
- setResizable(winAttr.initialResizability);
- }
public void setResizable(boolean resizable) {
- int fs = winAttr.functions;
- if (!isResizable() && resizable) {
- resetWMSetInsets();
- if (!isEmbedded()) {
- setReparented(false);
- }
- winAttr.isResizable = resizable;
- if ((fs & MWMConstants.MWM_FUNC_ALL) != 0) {
- fs &= ~(MWMConstants.MWM_FUNC_RESIZE | MWMConstants.MWM_FUNC_MAXIMIZE);
- } else {
- fs |= (MWMConstants.MWM_FUNC_RESIZE | MWMConstants.MWM_FUNC_MAXIMIZE);
+ XToolkit.awtLock();
+ try {
+ int fs = winAttr.functions;
+ if (!isResizable() && resizable) {
+ resetWMSetInsets();
+ if (!isEmbedded()) {
+ setReparented(false);
+ }
+ winAttr.isResizable = resizable;
+ if ((fs & MWMConstants.MWM_FUNC_ALL) != 0) {
+ fs &= ~(MWMConstants.MWM_FUNC_RESIZE
+ | MWMConstants.MWM_FUNC_MAXIMIZE);
+ } else {
+ fs |= (MWMConstants.MWM_FUNC_RESIZE
+ | MWMConstants.MWM_FUNC_MAXIMIZE);
+ }
+ winAttr.functions = fs;
+ XWM.setShellResizable(this);
+ } else if (isResizable() && !resizable) {
+ resetWMSetInsets();
+ if (!isEmbedded()) {
+ setReparented(false);
+ }
+ winAttr.isResizable = resizable;
+ if ((fs & MWMConstants.MWM_FUNC_ALL) != 0) {
+ fs |= (MWMConstants.MWM_FUNC_RESIZE
+ | MWMConstants.MWM_FUNC_MAXIMIZE);
+ } else {
+ fs &= ~(MWMConstants.MWM_FUNC_RESIZE
+ | MWMConstants.MWM_FUNC_MAXIMIZE);
+ }
+ winAttr.functions = fs;
+ XWM.setShellNotResizable(this, dimensions,
+ XWM.getWMID() == XWM.UNITY_COMPIZ_WM && configure_seen ?
+ dimensions.getScreenBounds() :
+ dimensions.getBounds(), false);
}
- winAttr.functions = fs;
- XWM.setShellResizable(this);
- } else if (isResizable() && !resizable) {
- resetWMSetInsets();
- if (!isEmbedded()) {
- setReparented(false);
- }
- winAttr.isResizable = resizable;
- if ((fs & MWMConstants.MWM_FUNC_ALL) != 0) {
- fs |= (MWMConstants.MWM_FUNC_RESIZE | MWMConstants.MWM_FUNC_MAXIMIZE);
- } else {
- fs &= ~(MWMConstants.MWM_FUNC_RESIZE | MWMConstants.MWM_FUNC_MAXIMIZE);
- }
- winAttr.functions = fs;
- XWM.setShellNotResizable(this, dimensions, dimensions.getBounds(), false);
+ } finally {
+ XToolkit.awtUnlock();
}
}
@@ -990,17 +973,16 @@
try {
if (configure_seen) {
return toGlobal(0,0);
- } else {
- Point location = target.getLocation();
- if (insLog.isLoggable(PlatformLogger.Level.FINE)) {
- insLog.fine("getLocationOnScreen {0} not reparented: {1} ",
- this, location);
- }
- return location;
}
} finally {
XToolkit.awtUnlock();
}
+ Point location = target.getLocation();
+ if (insLog.isLoggable(PlatformLogger.Level.FINE)) {
+ insLog.fine("getLocationOnScreen {0} not reparented: {1} ",
+ this, location);
+ }
+ return location;
}
@@ -1134,7 +1116,7 @@
return focusProxy;
}
- public void handleQuit() {
+ private void handleQuit() {
postEvent(new WindowEvent((Window)target, WindowEvent.WINDOW_CLOSING));
}
diff -r be8643ebe865 -r 6665640c56cf jdk/src/java.desktop/unix/classes/sun/awt/X11/XWM.java
--- a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XWM.java Fri Jan 13 01:36:02 2017 +0000
+++ b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XWM.java Wed Jul 05 22:41:30 2017 +0200
@@ -1029,8 +1029,14 @@
}
XToolkit.awtLock();
try {
- Rectangle shellBounds = window.getShellBounds();
- shellBounds.translate(-window.currentInsets.left, -window.currentInsets.top);
+ Rectangle shellBounds;
+ if (getWMID() != UNITY_COMPIZ_WM) {
+ shellBounds = window.getShellBounds();
+ shellBounds.translate(-window.currentInsets.left,
+ -window.currentInsets.top);
+ } else {
+ shellBounds = window.getDimensions().getScreenBounds();
+ }
window.updateSizeHints(window.getDimensions());
requestWMExtents(window.getWindow());
XlibWrapper.XMoveResizeWindow(XToolkit.getDisplay(),
diff -r be8643ebe865 -r 6665640c56cf jdk/src/java.desktop/unix/classes/sun/print/IPPPrintService.java
--- a/jdk/src/java.desktop/unix/classes/sun/print/IPPPrintService.java Fri Jan 13 01:36:02 2017 +0000
+++ b/jdk/src/java.desktop/unix/classes/sun/print/IPPPrintService.java Wed Jul 05 22:41:30 2017 +0200
@@ -1053,15 +1053,8 @@
// of setting it, it is a safe assumption to just always
// include SheetCollate as supported attribute.
- /*
- In Linux, we use Postscript for rendering but Linux still
- has issues in propagating Postscript-embedded setpagedevice
- setting like collation. Therefore, we temporarily exclude
- Linux.
- */
- if (!PrintServiceLookupProvider.isLinux()) {
- catList.add(SheetCollate.class);
- }
+ catList.add(SheetCollate.class);
+
}
// With the assumption that Chromaticity is equivalent to
diff -r be8643ebe865 -r 6665640c56cf jdk/src/java.rmi/share/classes/sun/rmi/registry/RegistryImpl.java
--- a/jdk/src/java.rmi/share/classes/sun/rmi/registry/RegistryImpl.java Fri Jan 13 01:36:02 2017 +0000
+++ b/jdk/src/java.rmi/share/classes/sun/rmi/registry/RegistryImpl.java Wed Jul 05 22:41:30 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 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
@@ -362,59 +362,81 @@
}
/**
- * Main program to start a registry.
- * The port number can be specified on the command line.
+ * Return a new RegistryImpl on the requested port and export it to serve
+ * registry requests. A classloader is initialized from the system property
+ * "env.class.path" and a security manager is set unless one is already set.
+ *
+ * The returned Registry is fully functional within the current process and
+ * is usable for internal and testing purposes.
+ *
+ * @param regPort port on which the rmiregistry accepts requests;
+ * if 0, an implementation specific port is assigned
+ * @return a RegistryImpl instance
+ * @exception RemoteException If remote operation failed.
+ * @since 9
*/
- public static void main(String args[])
- {
+ public static RegistryImpl createRegistry(int regPort) throws RemoteException {
// Create and install the security manager if one is not installed
// already.
if (System.getSecurityManager() == null) {
System.setSecurityManager(new SecurityManager());
}
+ /*
+ * Fix bugid 4147561: When JDK tools are executed, the value of
+ * the CLASSPATH environment variable for the shell in which they
+ * were invoked is no longer incorporated into the application
+ * class path; CLASSPATH's only effect is to be the value of the
+ * system property "env.class.path". To preserve the previous
+ * (JDK1.1 and JDK1.2beta3) behavior of this tool, however, its
+ * CLASSPATH should still be considered when resolving classes
+ * being unmarshalled. To effect this old behavior, a class
+ * loader that loads from the file path specified in the
+ * "env.class.path" property is created and set to be the context
+ * class loader before the remote object is exported.
+ */
+ String envcp = System.getProperty("env.class.path");
+ if (envcp == null) {
+ envcp = "."; // preserve old default behavior
+ }
+ URL[] urls = pathToURLs(envcp);
+ ClassLoader cl = new URLClassLoader(urls);
+
+ /*
+ * Fix bugid 4242317: Classes defined by this class loader should
+ * be annotated with the value of the "java.rmi.server.codebase"
+ * property, not the "file:" URLs for the CLASSPATH elements.
+ */
+ sun.rmi.server.LoaderHandler.registerCodebaseLoader(cl);
+
+ Thread.currentThread().setContextClassLoader(cl);
+
+ RegistryImpl registryImpl = null;
try {
- /*
- * Fix bugid 4147561: When JDK tools are executed, the value of
- * the CLASSPATH environment variable for the shell in which they
- * were invoked is no longer incorporated into the application
- * class path; CLASSPATH's only effect is to be the value of the
- * system property "env.class.path". To preserve the previous
- * (JDK1.1 and JDK1.2beta3) behavior of this tool, however, its
- * CLASSPATH should still be considered when resolving classes
- * being unmarshalled. To effect this old behavior, a class
- * loader that loads from the file path specified in the
- * "env.class.path" property is created and set to be the context
- * class loader before the remote object is exported.
- */
- String envcp = System.getProperty("env.class.path");
- if (envcp == null) {
- envcp = "."; // preserve old default behavior
- }
- URL[] urls = pathToURLs(envcp);
- ClassLoader cl = new URLClassLoader(urls);
+ registryImpl = AccessController.doPrivileged(
+ new PrivilegedExceptionAction() {
+ public RegistryImpl run() throws RemoteException {
+ return new RegistryImpl(regPort);
+ }
+ }, getAccessControlContext(regPort));
+ } catch (PrivilegedActionException ex) {
+ throw (RemoteException) ex.getException();
+ }
- /*
- * Fix bugid 4242317: Classes defined by this class loader should
- * be annotated with the value of the "java.rmi.server.codebase"
- * property, not the "file:" URLs for the CLASSPATH elements.
- */
- sun.rmi.server.LoaderHandler.registerCodebaseLoader(cl);
+ return registryImpl;
+ }
- Thread.currentThread().setContextClassLoader(cl);
-
+ /**
+ * Main program to start a registry.
+ * The port number can be specified on the command line.
+ */
+ public static void main(String args[])
+ {
+ try {
final int regPort = (args.length >= 1) ? Integer.parseInt(args[0])
: Registry.REGISTRY_PORT;
- try {
- registry = AccessController.doPrivileged(
- new PrivilegedExceptionAction() {
- public RegistryImpl run() throws RemoteException {
- return new RegistryImpl(regPort);
- }
- }, getAccessControlContext(regPort));
- } catch (PrivilegedActionException ex) {
- throw (RemoteException) ex.getException();
- }
+
+ registry = createRegistry(regPort);
// prevent registry from exiting
while (true) {
diff -r be8643ebe865 -r 6665640c56cf jdk/src/jdk.internal.le/windows/native/lible/WindowsTerminal.cpp
--- a/jdk/src/jdk.internal.le/windows/native/lible/WindowsTerminal.cpp Fri Jan 13 01:36:02 2017 +0000
+++ b/jdk/src/jdk.internal.le/windows/native/lible/WindowsTerminal.cpp Wed Jul 05 22:41:30 2017 +0200
@@ -102,26 +102,26 @@
JNIEXPORT jint JNICALL Java_jdk_internal_jline_WindowsTerminal_getWindowsTerminalWidth
(JNIEnv *, jobject) {
- HANDLE hStdIn;
- if ((hStdIn = GetStdHandle(STD_INPUT_HANDLE)) == INVALID_HANDLE_VALUE) {
+ HANDLE hStdOut;
+ if ((hStdOut = GetStdHandle(STD_OUTPUT_HANDLE)) == INVALID_HANDLE_VALUE) {
return -1;
}
CONSOLE_SCREEN_BUFFER_INFO info;
- if (! GetConsoleScreenBufferInfo(hStdIn, &info)) {
+ if (! GetConsoleScreenBufferInfo(hStdOut, &info)) {
return -1;
}
- return info.dwSize.X;
+ return info.srWindow.Right - info.srWindow.Left;
}
JNIEXPORT jint JNICALL Java_jdk_internal_jline_WindowsTerminal_getWindowsTerminalHeight
(JNIEnv *, jobject) {
- HANDLE hStdIn;
- if ((hStdIn = GetStdHandle(STD_INPUT_HANDLE)) == INVALID_HANDLE_VALUE) {
+ HANDLE hStdOut;
+ if ((hStdOut = GetStdHandle(STD_OUTPUT_HANDLE)) == INVALID_HANDLE_VALUE) {
return -1;
}
CONSOLE_SCREEN_BUFFER_INFO info;
- if (! GetConsoleScreenBufferInfo(hStdIn, &info)) {
+ if (! GetConsoleScreenBufferInfo(hStdOut, &info)) {
return -1;
}
- return info.dwSize.Y;
+ return info.srWindow.Bottom - info.srWindow.Top + 1;
}
diff -r be8643ebe865 -r 6665640c56cf jdk/src/jdk.jartool/share/classes/sun/tools/jar/GNUStyleOptions.java
--- a/jdk/src/jdk.jartool/share/classes/sun/tools/jar/GNUStyleOptions.java Fri Jan 13 01:36:02 2017 +0000
+++ b/jdk/src/jdk.jartool/share/classes/sun/tools/jar/GNUStyleOptions.java Wed Jul 05 22:41:30 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 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
@@ -34,6 +34,8 @@
import java.nio.file.Paths;
import java.util.regex.Pattern;
import java.util.regex.PatternSyntaxException;
+
+import jdk.internal.module.ModulePath;
import jdk.internal.module.ModuleResolution;
/**
@@ -155,8 +157,8 @@
for (String dir : dirs) {
paths[i++] = Paths.get(dir);
}
- jartool.moduleFinder = ModuleFinder.compose(jartool.moduleFinder,
- ModuleFinder.of(paths));
+ jartool.moduleFinder =
+ new ModulePath(Runtime.version(), true, paths);
}
},
new Option(false, OptionType.CREATE_UPDATE, "--do-not-resolve-by-default") {
@@ -169,9 +171,9 @@
new Option(true, OptionType.CREATE_UPDATE, "--warn-if-resolved") {
void process(Main jartool, String opt, String arg) throws BadArgs {
ModuleResolution mres = ModuleResolution.empty();
- if (jartool.moduleResolution.doNotResolveByDefault())
+ if (jartool.moduleResolution.doNotResolveByDefault()) {
mres.withDoNotResolveByDefault();
-
+ }
if (arg.equals("deprecated")) {
jartool.moduleResolution = mres.withDeprecated();
} else if (arg.equals("deprecated-for-removal")) {
@@ -201,26 +203,27 @@
// Other options
new Option(true, true, OptionType.OTHER, "--help", "-h") {
void process(Main jartool, String opt, String arg) throws BadArgs {
- if (arg == null) {
- jartool.info = Main.Info.HELP;
- return;
+ if (jartool.info == null) {
+ if (arg == null) {
+ jartool.info = GNUStyleOptions::printHelp; // Main.Info.HELP;
+ return;
+ }
+ if (!arg.equals("compat"))
+ throw new BadArgs("error.illegal.option", arg).showUsage(true);
+ // jartool.info = Main.Info.COMPAT_HELP;
+ jartool.info = GNUStyleOptions::printCompatHelp;
}
-
- if (!arg.equals("compat"))
- throw new BadArgs("error.illegal.option", arg).showUsage(true);
-
- jartool.info = Main.Info.COMPAT_HELP;
}
},
new Option(false, OptionType.OTHER, "--help-extra") {
void process(Main jartool, String opt, String arg) throws BadArgs {
- jartool.info = Main.Info.HELP_EXTRA;
+ jartool.info = GNUStyleOptions::printHelpExtra;
}
},
new Option(false, OptionType.OTHER, "--version") {
void process(Main jartool, String opt, String arg) {
if (jartool.info == null)
- jartool.info = Main.Info.VERSION;
+ jartool.info = GNUStyleOptions::printVersion;
}
}
};
@@ -279,14 +282,14 @@
static int parseOptions(Main jartool, String[] args) throws BadArgs {
int count = 0;
if (args.length == 0) {
- jartool.info = Main.Info.USAGE_TRYHELP;
+ jartool.info = GNUStyleOptions::printUsageTryHelp; // never be here
return 0;
}
// process options
for (; count < args.length; count++) {
- if (args[count].charAt(0) != '-' || args[count].equals("-C")
- || args[count].equals("--release"))
+ if (args[count].charAt(0) != '-' || args[count].equals("-C") ||
+ args[count].equals("--release"))
break;
String name = args[count];
@@ -322,15 +325,15 @@
throw new BadArgs("error.unrecognized.option", name).showUsage(true);
}
- static void printHelp(PrintWriter out) {
- printHelp(out, false);
+ static void printHelpExtra(PrintWriter out) {
+ printHelp0(out, true);
}
- static void printHelpExtra(PrintWriter out) {
- printHelp(out, true);
+ static void printHelp(PrintWriter out) {
+ printHelp0(out, false);
}
- private static void printHelp(PrintWriter out, boolean printExtra) {
+ private static void printHelp0(PrintWriter out, boolean printExtra) {
out.format("%s%n", Main.getMsg("main.help.preopt"));
for (OptionType type : OptionType.values()) {
boolean typeHeadingWritten = false;
diff -r be8643ebe865 -r 6665640c56cf jdk/src/jdk.jartool/share/classes/sun/tools/jar/Main.java
--- a/jdk/src/jdk.jartool/share/classes/sun/tools/jar/Main.java Fri Jan 13 01:36:02 2017 +0000
+++ b/jdk/src/jdk.jartool/share/classes/sun/tools/jar/Main.java Wed Jul 05 22:41:30 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 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
@@ -27,6 +27,7 @@
import java.io.*;
import java.lang.module.Configuration;
+import java.lang.module.InvalidModuleDescriptorException;
import java.lang.module.ModuleDescriptor;
import java.lang.module.ModuleDescriptor.Exports;
import java.lang.module.ModuleDescriptor.Provides;
@@ -46,7 +47,7 @@
import java.nio.file.StandardCopyOption;
import java.util.*;
import java.util.function.Consumer;
-import java.util.function.Function;
+import java.util.function.Supplier;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
import java.util.stream.Stream;
@@ -58,6 +59,7 @@
import jdk.internal.module.Checks;
import jdk.internal.module.ModuleHashes;
+import jdk.internal.module.ModuleHashesBuilder;
import jdk.internal.module.ModuleInfo;
import jdk.internal.module.ModuleInfoExtender;
import jdk.internal.module.ModuleResolution;
@@ -66,7 +68,6 @@
import static jdk.internal.util.jar.JarIndex.INDEX_NAME;
import static java.util.jar.JarFile.MANIFEST_NAME;
import static java.util.stream.Collectors.joining;
-import static java.util.stream.Collectors.toSet;
import static java.nio.file.StandardCopyOption.REPLACE_EXISTING;
/**
@@ -74,58 +75,24 @@
* (Java Archive) file format. The JAR format is based on the ZIP file
* format, with optional meta-information stored in a MANIFEST entry.
*/
-public
-class Main {
+public class Main {
String program;
PrintWriter out, err;
String fname, mname, ename;
String zname = "";
String rootjar = null;
- Set concealedPackages = new HashSet<>(); // used by Validator
private static final int BASE_VERSION = 0;
- class Entry {
- final String basename;
- final String entryname;
+ private static class Entry {
+ final String name;
final File file;
final boolean isDir;
- Entry(File file, String basename, String entryname) {
- this.file = file;
- this.isDir = file.isDirectory();
- this.basename = basename;
- this.entryname = entryname;
- }
-
- Entry(int version, File file) {
+ Entry(File file, String name, boolean isDir) {
this.file = file;
- String path = file.getPath();
- if (file.isDirectory()) {
- isDir = true;
- path = path.endsWith(File.separator) ? path :
- path + File.separator;
- } else {
- isDir = false;
- }
- EntryName en = new EntryName(path, version);
- basename = en.baseName;
- entryname = en.entryName;
- }
-
- /**
- * Returns a new Entry that trims the versions directory.
- *
- * This entry should be a valid entry matching the given version.
- */
- Entry toVersionedEntry(int version) {
- assert isValidVersionedEntry(this, version);
-
- if (version == BASE_VERSION)
- return this;
-
- EntryName en = new EntryName(trimVersionsDir(basename, version), version);
- return new Entry(this.file, en.baseName, en.entryName);
+ this.isDir = isDir;
+ this.name = name;
}
@Override
@@ -141,32 +108,6 @@
}
}
- class EntryName {
- final String baseName;
- final String entryName;
-
- EntryName(String name, int version) {
- name = name.replace(File.separatorChar, '/');
- String matchPath = "";
- for (String path : pathsMap.get(version)) {
- if (name.startsWith(path)
- && (path.length() > matchPath.length())) {
- matchPath = path;
- }
- }
- name = safeName(name.substring(matchPath.length()));
- // the old implementaton doesn't remove
- // "./" if it was led by "/" (?)
- if (name.startsWith("./")) {
- name = name.substring(2);
- }
- baseName = name;
- entryName = (version > BASE_VERSION)
- ? VERSIONS_DIR + version + "/" + baseName
- : baseName;
- }
- }
-
// An entryName(path)->Entry map generated during "expand", it helps to
// decide whether or not an existing entry in a jar file needs to be
// replaced, during the "update" operation.
@@ -175,11 +116,8 @@
// All entries need to be added/updated.
Set entries = new LinkedHashSet<>();
- // All packages.
- Set packages = new HashSet<>();
- // All actual entries added, or existing, in the jar file ( excl manifest
- // and module-info.class ). Populated during create or update.
- Set jarEntries = new HashSet<>();
+ // module-info.class entries need to be added/updated.
+ Map moduleInfos = new HashMap<>();
// A paths Set for each version, where each Set contains directories
// specified by the "-C" operation.
@@ -208,19 +146,7 @@
boolean cflag, uflag, xflag, tflag, vflag, flag0, Mflag, iflag, nflag, pflag, dflag;
/* To support additional GNU Style informational options */
- enum Info {
- HELP(GNUStyleOptions::printHelp),
- HELP_EXTRA(GNUStyleOptions::printHelpExtra),
- COMPAT_HELP(GNUStyleOptions::printCompatHelp),
- USAGE_TRYHELP(GNUStyleOptions::printUsageTryHelp),
- VERSION(GNUStyleOptions::printVersion);
-
- private Consumer printFunction;
- Info(Consumer f) { this.printFunction = f; }
- void print(PrintWriter out) { printFunction.accept(out); }
- };
- Info info;
-
+ Consumer info;
/* Modular jar related options */
Version moduleVersion;
@@ -228,8 +154,7 @@
ModuleResolution moduleResolution = ModuleResolution.empty();
ModuleFinder moduleFinder = ModuleFinder.of();
- private static final String MODULE_INFO = "module-info.class";
-
+ static final String MODULE_INFO = "module-info.class";
static final String MANIFEST_DIR = "META-INF/";
static final String VERSIONS_DIR = MANIFEST_DIR + "versions/";
static final String VERSION = "1.0";
@@ -324,7 +249,6 @@
}
}
}
-
if (cflag) {
Manifest manifest = null;
if (!Mflag) {
@@ -347,72 +271,60 @@
addMultiRelease(manifest);
}
}
-
- Map moduleInfoPaths = new HashMap<>();
- for (int version : filesMap.keySet()) {
- String[] files = filesMap.get(version);
- expand(null, files, false, moduleInfoPaths, version);
- }
-
- Map moduleInfos = new LinkedHashMap<>();
- if (!moduleInfoPaths.isEmpty()) {
- if (!checkModuleInfos(moduleInfoPaths))
- return false;
-
- // root module-info first
- byte[] b = readModuleInfo(moduleInfoPaths.get(MODULE_INFO));
- moduleInfos.put(MODULE_INFO, b);
- for (Map.Entry e : moduleInfoPaths.entrySet())
- moduleInfos.putIfAbsent(e.getKey(), readModuleInfo(e.getValue()));
-
- if (!addExtendedModuleAttributes(moduleInfos))
- return false;
+ expand();
+ if (!moduleInfos.isEmpty()) {
+ // All actual file entries (excl manifest and module-info.class)
+ Set jentries = new HashSet<>();
+ // all packages if it's a class or resource
+ Set packages = new HashSet<>();
+ entries.stream()
+ .filter(e -> !e.isDir)
+ .forEach( e -> {
+ addPackageIfNamed(packages, e.name);
+ jentries.add(e.name);
+ });
+ addExtendedModuleAttributes(moduleInfos, packages);
// Basic consistency checks for modular jars.
- if (!checkServices(moduleInfos.get(MODULE_INFO)))
+ if (!checkModuleInfo(moduleInfos.get(MODULE_INFO), jentries))
return false;
} else if (moduleVersion != null || modulesToHash != null) {
error(getMsg("error.module.options.without.info"));
return false;
}
-
if (vflag && fname == null) {
// Disable verbose output so that it does not appear
// on stdout along with file data
// error("Warning: -v option ignored");
vflag = false;
}
-
final String tmpbase = (fname == null)
? "tmpjar"
: fname.substring(fname.indexOf(File.separatorChar) + 1);
+
File tmpfile = createTemporaryFile(tmpbase, ".jar");
-
try (OutputStream out = new FileOutputStream(tmpfile)) {
- create(new BufferedOutputStream(out, 4096), manifest, moduleInfos);
+ create(new BufferedOutputStream(out, 4096), manifest);
}
-
if (nflag) {
File packFile = createTemporaryFile(tmpbase, ".pack");
try {
Packer packer = Pack200.newPacker();
Map p = packer.properties();
p.put(Packer.EFFORT, "1"); // Minimal effort to conserve CPU
- try (
- JarFile jarFile = new JarFile(tmpfile.getCanonicalPath());
- OutputStream pack = new FileOutputStream(packFile)
- ) {
+ try (JarFile jarFile = new JarFile(tmpfile.getCanonicalPath());
+ OutputStream pack = new FileOutputStream(packFile))
+ {
packer.pack(jarFile, pack);
}
if (tmpfile.exists()) {
tmpfile.delete();
}
tmpfile = createTemporaryFile(tmpbase, ".jar");
- try (
- OutputStream out = new FileOutputStream(tmpfile);
- JarOutputStream jos = new JarOutputStream(out)
- ) {
+ try (OutputStream out = new FileOutputStream(tmpfile);
+ JarOutputStream jos = new JarOutputStream(out))
+ {
Unpacker unpacker = Pack200.newUnpacker();
unpacker.unpack(packFile, jos);
}
@@ -420,9 +332,7 @@
Files.deleteIfExists(packFile.toPath());
}
}
-
validateAndClose(tmpfile);
-
} else if (uflag) {
File inputFile = null, tmpFile = null;
if (fname != null) {
@@ -432,39 +342,20 @@
vflag = false;
tmpFile = createTemporaryFile("tmpjar", ".jar");
}
-
- Map moduleInfoPaths = new HashMap<>();
- for (int version : filesMap.keySet()) {
- String[] files = filesMap.get(version);
- expand(null, files, true, moduleInfoPaths, version);
+ expand();
+ try (FileInputStream in = (fname != null) ? new FileInputStream(inputFile)
+ : new FileInputStream(FileDescriptor.in);
+ FileOutputStream out = new FileOutputStream(tmpFile);
+ InputStream manifest = (!Mflag && (mname != null)) ?
+ (new FileInputStream(mname)) : null;
+ ) {
+ boolean updateOk = update(in, new BufferedOutputStream(out),
+ manifest, moduleInfos, null);
+ if (ok) {
+ ok = updateOk;
+ }
}
-
- Map moduleInfos = new HashMap<>();
- for (Map.Entry e : moduleInfoPaths.entrySet())
- moduleInfos.put(e.getKey(), readModuleInfo(e.getValue()));
-
- try (
- FileInputStream in = (fname != null) ? new FileInputStream(inputFile)
- : new FileInputStream(FileDescriptor.in);
- FileOutputStream out = new FileOutputStream(tmpFile);
- InputStream manifest = (!Mflag && (mname != null)) ?
- (new FileInputStream(mname)) : null;
- ) {
- boolean updateOk = update(in, new BufferedOutputStream(out),
- manifest, moduleInfos, null);
- if (ok) {
- ok = updateOk;
- }
- }
-
- // Consistency checks for modular jars.
- if (!moduleInfos.isEmpty()) {
- if(!checkServices(moduleInfos.get(MODULE_INFO)))
- return false;
- }
-
validateAndClose(tmpFile);
-
} else if (tflag) {
replaceFSC(filesMap);
// For the "list table contents" action, access using the
@@ -542,12 +433,15 @@
private void validateAndClose(File tmpfile) throws IOException {
if (ok && isMultiRelease) {
- ok = validate(tmpfile.getCanonicalPath());
- if (!ok) {
- error(formatMsg("error.validator.jarfile.invalid", fname));
+ try (JarFile jf = new JarFile(tmpfile)) {
+ ok = Validator.validate(this, jf);
+ if (!ok) {
+ error(formatMsg("error.validator.jarfile.invalid", fname));
+ }
+ } catch (IOException e) {
+ error(formatMsg2("error.validator.jarfile.exception", fname, e.getMessage()));
}
}
-
Path path = tmpfile.toPath();
try {
if (ok) {
@@ -572,78 +466,9 @@
Stream filesToEntryNames(Map.Entry fileEntries) {
int version = fileEntries.getKey();
+ Set cpaths = pathsMap.get(version);
return Stream.of(fileEntries.getValue())
- .map(f -> (new EntryName(f, version)).entryName);
- }
-
- // sort base entries before versioned entries, and sort entry classes with
- // nested classes so that the top level class appears before the associated
- // nested class
- private Comparator entryComparator = (je1, je2) -> {
- String s1 = je1.getName();
- String s2 = je2.getName();
- if (s1.equals(s2)) return 0;
- boolean b1 = s1.startsWith(VERSIONS_DIR);
- boolean b2 = s2.startsWith(VERSIONS_DIR);
- if (b1 && !b2) return 1;
- if (!b1 && b2) return -1;
- int n = 0; // starting char for String compare
- if (b1 && b2) {
- // normally strings would be sorted so "10" goes before "9", but
- // version number strings need to be sorted numerically
- n = VERSIONS_DIR.length(); // skip the common prefix
- int i1 = s1.indexOf('/', n);
- int i2 = s1.indexOf('/', n);
- if (i1 == -1) throw new InvalidJarException(s1);
- if (i2 == -1) throw new InvalidJarException(s2);
- // shorter version numbers go first
- if (i1 != i2) return i1 - i2;
- // otherwise, handle equal length numbers below
- }
- int l1 = s1.length();
- int l2 = s2.length();
- int lim = Math.min(l1, l2);
- for (int k = n; k < lim; k++) {
- char c1 = s1.charAt(k);
- char c2 = s2.charAt(k);
- if (c1 != c2) {
- // change natural ordering so '.' comes before '$'
- // i.e. top level classes come before nested classes
- if (c1 == '$' && c2 == '.') return 1;
- if (c1 == '.' && c2 == '$') return -1;
- return c1 - c2;
- }
- }
- return l1 - l2;
- };
-
- private boolean validate(String fname) {
- boolean valid;
-
- try (JarFile jf = new JarFile(fname)) {
- Validator validator = new Validator(this, jf);
- jf.stream()
- .filter(e -> !e.isDirectory())
- .filter(e -> !e.getName().equals(MANIFEST_NAME))
- .filter(e -> !e.getName().endsWith(MODULE_INFO))
- .sorted(entryComparator)
- .forEachOrdered(validator);
- valid = validator.isValid();
- } catch (IOException e) {
- error(formatMsg2("error.validator.jarfile.exception", fname, e.getMessage()));
- valid = false;
- } catch (InvalidJarException e) {
- error(formatMsg("error.validator.bad.entry.name", e.getMessage()));
- valid = false;
- }
- return valid;
- }
-
- private static class InvalidJarException extends RuntimeException {
- private static final long serialVersionUID = -3642329147299217726L;
- InvalidJarException(String msg) {
- super(msg);
- }
+ .map(f -> toVersionedName(toEntryName(f, cpaths, false), version));
}
/**
@@ -668,20 +493,22 @@
// Note: flags.length == 2 can be treated as the short version of
// the GNU option since the there cannot be any other options,
// excluding -C, as per the old way.
- if (flags.startsWith("--")
- || (flags.startsWith("-") && flags.length() == 2)) {
+ if (flags.startsWith("--") ||
+ (flags.startsWith("-") && flags.length() == 2)) {
try {
count = GNUStyleOptions.parseOptions(this, args);
} catch (GNUStyleOptions.BadArgs x) {
if (info == null) {
- error(x.getMessage());
- if (x.showUsage)
- Info.USAGE_TRYHELP.print(err);
+ if (x.showUsage) {
+ usageError(x.getMessage());
+ } else {
+ error(x.getMessage());
+ }
return false;
}
}
if (info != null) {
- info.print(out);
+ info.accept(out);
return true;
}
} else {
@@ -851,19 +678,55 @@
* Add the package of the given resource name if it's a .class
* or a resource in a named package.
*/
- boolean addPackageIfNamed(String name) {
+ void addPackageIfNamed(Set packages, String name) {
if (name.startsWith(VERSIONS_DIR)) {
- throw new InternalError(name);
+ // trim the version dir prefix
+ int i0 = VERSIONS_DIR.length();
+ int i = name.indexOf('/', i0);
+ if (i <= 0) {
+ warn(formatMsg("warn.release.unexpected.versioned.entry", name));
+ return;
+ }
+ while (i0 < i) {
+ char c = name.charAt(i0);
+ if (c < '0' || c > '9') {
+ warn(formatMsg("warn.release.unexpected.versioned.entry", name));
+ return;
+ }
+ i0++;
+ }
+ name = name.substring(i + 1, name.length());
}
-
String pn = toPackageName(name);
// add if this is a class or resource in a package
if (Checks.isJavaIdentifier(pn)) {
packages.add(pn);
- return true;
+ }
+ }
+
+ private String toEntryName(String name, Set cpaths, boolean isDir) {
+ name = name.replace(File.separatorChar, '/');
+ if (isDir) {
+ name = name.endsWith("/") ? name : name + "/";
}
+ String matchPath = "";
+ for (String path : cpaths) {
+ if (name.startsWith(path) && path.length() > matchPath.length()) {
+ matchPath = path;
+ }
+ }
+ name = safeName(name.substring(matchPath.length()));
+ // the old implementaton doesn't remove
+ // "./" if it was led by "/" (?)
+ if (name.startsWith("./")) {
+ name = name.substring(2);
+ }
+ return name;
+ }
- return false;
+ private static String toVersionedName(String name, int version) {
+ return version > BASE_VERSION
+ ? VERSIONS_DIR + version + "/" + name : name;
}
private static String toPackageName(String path) {
@@ -875,57 +738,23 @@
}
}
- /*
- * Returns true if the given entry is a valid entry of the given version.
- */
- private boolean isValidVersionedEntry(Entry entry, int version) {
- String name = entry.basename;
- if (name.startsWith(VERSIONS_DIR) && version != BASE_VERSION) {
- int i = name.indexOf('/', VERSIONS_DIR.length());
- // name == -1 -> not a versioned directory, something else
- if (i == -1)
- return false;
- try {
- String v = name.substring(VERSIONS_DIR.length(), i);
- return Integer.valueOf(v) == version;
- } catch (NumberFormatException x) {
- return false;
- }
+ private void expand() throws IOException {
+ for (int version : filesMap.keySet()) {
+ String[] files = filesMap.get(version);
+ expand(null, files, pathsMap.get(version), version);
}
- return true;
- }
-
- /*
- * Trim META-INF/versions/$version/ from the given name if the
- * given name is a versioned entry of the given version; or
- * of any version if the given version is BASE_VERSION
- */
- private String trimVersionsDir(String name, int version) {
- if (name.startsWith(VERSIONS_DIR)) {
- int i = name.indexOf('/', VERSIONS_DIR.length());
- if (i >= 0) {
- try {
- String v = name.substring(VERSIONS_DIR.length(), i);
- if (version == BASE_VERSION || Integer.valueOf(v) == version) {
- return name.substring(i + 1, name.length());
- }
- } catch (NumberFormatException x) {}
- }
- throw new InternalError("unexpected versioned entry: " +
- name + " version " + version);
- }
- return name;
}
/**
* Expands list of files to process into full list of all files that
* can be found by recursively descending directories.
+ *
+ * @param dir parent directory
+ * @param file s list of files to expand
+ * @param cpaths set of directories specified by -C option for the files
+ * @throws IOException if an I/O error occurs
*/
- void expand(File dir,
- String[] files,
- boolean isUpdate,
- Map moduleInfoPaths,
- int version)
+ private void expand(File dir, String[] files, Set cpaths, int version)
throws IOException
{
if (files == null)
@@ -938,47 +767,48 @@
else
f = new File(dir, files[i]);
- Entry e = new Entry(version, f);
- String entryName = e.entryname;
- Entry entry = e;
- if (e.basename.startsWith(VERSIONS_DIR) && isValidVersionedEntry(e, version)) {
- entry = e.toVersionedEntry(version);
- }
- if (f.isFile()) {
- if (entryName.endsWith(MODULE_INFO)) {
- moduleInfoPaths.put(entryName, f.toPath());
- if (isUpdate)
- entryMap.put(entryName, entry);
- } else if (isValidVersionedEntry(entry, version)) {
- if (entries.add(entry)) {
- jarEntries.add(entryName);
- // add the package if it's a class or resource
- addPackageIfNamed(trimVersionsDir(entry.basename, version));
- if (isUpdate)
- entryMap.put(entryName, entry);
- }
- } else {
+ boolean isDir = f.isDirectory();
+ String name = toEntryName(f.getPath(), cpaths, isDir);
+
+ if (version != BASE_VERSION) {
+ if (name.startsWith(VERSIONS_DIR)) {
+ // the entry starts with VERSIONS_DIR and version != BASE_VERSION,
+ // which means the "[dirs|files]" in --release v [dirs|files]
+ // includes VERSIONS_DIR-ed entries --> warning and skip (?)
error(formatMsg2("error.release.unexpected.versioned.entry",
- entry.basename, String.valueOf(version)));
+ name, String.valueOf(version)));
ok = false;
+ return;
}
- } else if (f.isDirectory()) {
- if (isValidVersionedEntry(entry, version)) {
- if (entries.add(entry)) {
- if (isUpdate) {
- entryMap.put(entryName, entry);
- }
+ name = toVersionedName(name, version);
+ }
+
+ if (f.isFile()) {
+ Entry e = new Entry(f, name, false);
+ if (isModuleInfoEntry(name)) {
+ moduleInfos.putIfAbsent(name, Files.readAllBytes(f.toPath()));
+ if (uflag)
+ entryMap.put(name, e);
+ } else if (entries.add(e)) {
+ if (uflag)
+ entryMap.put(name, e);
+ }
+ } else if (isDir) {
+ Entry e = new Entry(f, name, true);
+ if (entries.add(e)) {
+ // utilize entryMap for the duplicate dir check even in
+ // case of cflag == true.
+ // dir name confilict/duplicate could happen with -C option.
+ // just remove the last "e" from the "entries" (zos will fail
+ // with "duplicated" entries), but continue expanding the
+ // sub tree
+ if (entryMap.containsKey(name)) {
+ entries.remove(e);
+ } else {
+ entryMap.put(name, e);
}
- } else if (entry.basename.equals(VERSIONS_DIR)) {
- if (vflag) {
- output(formatMsg("out.ignore.entry", entry.basename));
- }
- } else {
- error(formatMsg2("error.release.unexpected.versioned.entry",
- entry.basename, String.valueOf(version)));
- ok = false;
+ expand(f, f.list(), cpaths, version);
}
- expand(f, f.list(), isUpdate, moduleInfoPaths, version);
} else {
error(formatMsg("error.nosuch.fileordir", String.valueOf(f)));
ok = false;
@@ -989,52 +819,36 @@
/**
* Creates a new JAR file.
*/
- void create(OutputStream out, Manifest manifest, Map moduleInfos)
- throws IOException
+ void create(OutputStream out, Manifest manifest) throws IOException
{
- ZipOutputStream zos = new JarOutputStream(out);
- if (flag0) {
- zos.setMethod(ZipOutputStream.STORED);
- }
- // TODO: check module-info attributes against manifest ??
- if (manifest != null) {
- if (vflag) {
- output(getMsg("out.added.manifest"));
- }
- ZipEntry e = new ZipEntry(MANIFEST_DIR);
- e.setTime(System.currentTimeMillis());
- e.setSize(0);
- e.setCrc(0);
- zos.putNextEntry(e);
- e = new ZipEntry(MANIFEST_NAME);
- e.setTime(System.currentTimeMillis());
+ try (ZipOutputStream zos = new JarOutputStream(out)) {
if (flag0) {
- crc32Manifest(e, manifest);
+ zos.setMethod(ZipOutputStream.STORED);
}
- zos.putNextEntry(e);
- manifest.write(zos);
- zos.closeEntry();
- }
- for (Map.Entry mi : moduleInfos.entrySet()) {
- String entryName = mi.getKey();
- byte[] miBytes = mi.getValue();
- if (vflag) {
- output(formatMsg("out.added.module-info", entryName));
+ // TODO: check module-info attributes against manifest ??
+ if (manifest != null) {
+ if (vflag) {
+ output(getMsg("out.added.manifest"));
+ }
+ ZipEntry e = new ZipEntry(MANIFEST_DIR);
+ e.setTime(System.currentTimeMillis());
+ e.setSize(0);
+ e.setCrc(0);
+ zos.putNextEntry(e);
+ e = new ZipEntry(MANIFEST_NAME);
+ e.setTime(System.currentTimeMillis());
+ if (flag0) {
+ crc32Manifest(e, manifest);
+ }
+ zos.putNextEntry(e);
+ manifest.write(zos);
+ zos.closeEntry();
}
- ZipEntry e = new ZipEntry(mi.getKey());
- e.setTime(System.currentTimeMillis());
- if (flag0) {
- crc32ModuleInfo(e, miBytes);
+ updateModuleInfo(moduleInfos, zos);
+ for (Entry entry : entries) {
+ addFile(zos, entry);
}
- zos.putNextEntry(e);
- ByteArrayInputStream in = new ByteArrayInputStream(miBytes);
- in.transferTo(zos);
- zos.closeEntry();
}
- for (Entry entry : entries) {
- addFile(zos, entry);
- }
- zos.close();
}
private char toUpperCaseASCII(char c) {
@@ -1062,30 +876,6 @@
}
/**
- * Returns true of the given module-info's are located in acceptable
- * locations. Otherwise, outputs an appropriate message and returns false.
- */
- private boolean checkModuleInfos(Map moduleInfos) {
- // there must always be, at least, a root module-info
- if (!moduleInfos.containsKey(MODULE_INFO)) {
- error(getMsg("error.versioned.info.without.root"));
- return false;
- }
-
- // module-info can only appear in the root, or a versioned section
- Optional other = moduleInfos.keySet().stream()
- .filter(x -> !x.equals(MODULE_INFO))
- .filter(x -> !x.startsWith(VERSIONS_DIR))
- .findFirst();
-
- if (other.isPresent()) {
- error(formatMsg("error.unexpected.module-info", other.get()));
- return false;
- }
- return true;
- }
-
- /**
* Updates an existing jar file.
*/
boolean update(InputStream in, OutputStream out,
@@ -1099,6 +889,10 @@
boolean foundManifest = false;
boolean updateOk = true;
+ // All actual entries added/updated/existing, in the jar file (excl manifest
+ // and module-info.class ).
+ Set jentries = new HashSet<>();
+
if (jarIndex != null) {
addIndex(jarIndex, zos);
}
@@ -1108,7 +902,7 @@
String name = e.getName();
boolean isManifestEntry = equalsIgnoreCase(name, MANIFEST_NAME);
- boolean isModuleInfoEntry = name.endsWith(MODULE_INFO);
+ boolean isModuleInfoEntry = isModuleInfoEntry(name);
if ((jarIndex != null && equalsIgnoreCase(name, INDEX_NAME))
|| (Mflag && isManifestEntry)) {
@@ -1127,7 +921,6 @@
return false;
}
}
-
// Update the manifest.
Manifest old = new Manifest(zis);
if (newManifest != null) {
@@ -1137,7 +930,7 @@
return false;
}
} else if (moduleInfos != null && isModuleInfoEntry) {
- moduleInfos.putIfAbsent(name, readModuleInfo(zis));
+ moduleInfos.putIfAbsent(name, zis.readAllBytes());
} else {
boolean isDir = e.isDirectory();
if (!entryMap.containsKey(name)) { // copy the old stuff
@@ -1160,11 +953,8 @@
entries.remove(ent);
isDir = ent.isDir;
}
-
- jarEntries.add(name);
if (!isDir) {
- // add the package if it's a class or resource
- addPackageIfNamed(trimVersionsDir(name, BASE_VERSION));
+ jentries.add(name);
}
}
}
@@ -1172,6 +962,9 @@
// add the remaining new files
for (Entry entry : entries) {
addFile(zos, entry);
+ if (!entry.isDir) {
+ jentries.add(entry.name);
+ }
}
if (!foundManifest) {
if (newManifest != null) {
@@ -1188,35 +981,24 @@
}
}
}
-
- if (moduleInfos != null && !moduleInfos.isEmpty()) {
- if (!checkModuleInfos(moduleInfos))
+ if (updateOk) {
+ if (moduleInfos != null && !moduleInfos.isEmpty()) {
+ Set pkgs = new HashSet<>();
+ jentries.forEach( je -> addPackageIfNamed(pkgs, je));
+ addExtendedModuleAttributes(moduleInfos, pkgs);
+ updateOk = checkModuleInfo(moduleInfos.get(MODULE_INFO), jentries);
+ updateModuleInfo(moduleInfos, zos);
+ // TODO: check manifest main classes, etc
+ } else if (moduleVersion != null || modulesToHash != null) {
+ error(getMsg("error.module.options.without.info"));
updateOk = false;
-
- if (updateOk) {
- if (!addExtendedModuleAttributes(moduleInfos))
- updateOk = false;
}
-
- // TODO: check manifest main classes, etc
-
- if (updateOk) {
- for (Map.Entry mi : moduleInfos.entrySet()) {
- if (!updateModuleInfo(mi.getValue(), zos, mi.getKey()))
- updateOk = false;
- }
- }
- } else if (moduleVersion != null || modulesToHash != null) {
- error(getMsg("error.module.options.without.info"));
- updateOk = false;
}
-
zis.close();
zos.close();
return updateOk;
}
-
private void addIndex(JarIndex index, ZipOutputStream zos)
throws IOException
{
@@ -1232,20 +1014,25 @@
zos.closeEntry();
}
- private boolean updateModuleInfo(byte[] moduleInfoBytes, ZipOutputStream zos, String entryName)
+ private void updateModuleInfo(Map moduleInfos, ZipOutputStream zos)
throws IOException
{
- ZipEntry e = new ZipEntry(entryName);
- e.setTime(System.currentTimeMillis());
- if (flag0) {
- crc32ModuleInfo(e, moduleInfoBytes);
+ String fmt = uflag ? "out.update.module-info": "out.added.module-info";
+ for (Map.Entry mi : moduleInfos.entrySet()) {
+ String name = mi.getKey();
+ byte[] bytes = mi.getValue();
+ ZipEntry e = new ZipEntry(name);
+ e.setTime(System.currentTimeMillis());
+ if (flag0) {
+ crc32ModuleInfo(e, bytes);
+ }
+ zos.putNextEntry(e);
+ zos.write(bytes);
+ zos.closeEntry();
+ if (vflag) {
+ output(formatMsg(fmt, name));
+ }
}
- zos.putNextEntry(e);
- zos.write(moduleInfoBytes);
- if (vflag) {
- output(formatMsg("out.update.module-info", entryName));
- }
- return true;
}
private boolean updateManifest(Manifest m, ZipOutputStream zos)
@@ -1358,11 +1145,9 @@
* Adds a new file entry to the ZIP output stream.
*/
void addFile(ZipOutputStream zos, Entry entry) throws IOException {
- // skip the generation of directory entries for META-INF/versions/*/
- if (entry.basename.isEmpty()) return;
File file = entry.file;
- String name = entry.entryname;
+ String name = entry.name;
boolean isDir = entry.isDir;
if (name.equals("") || name.equals(".") || name.equals(zname)) {
@@ -1444,11 +1229,8 @@
* @throws IOException if an I/O error occurs
*/
private void copy(File from, OutputStream to) throws IOException {
- InputStream in = new FileInputStream(from);
- try {
+ try (InputStream in = new FileInputStream(from)) {
copy(in, to);
- } finally {
- in.close();
}
}
@@ -1461,11 +1243,8 @@
* @throws IOException if an I/O error occurs
*/
private void copy(InputStream from, File to) throws IOException {
- OutputStream out = new FileOutputStream(to);
- try {
+ try (OutputStream out = new FileOutputStream(to)) {
copy(from, out);
- } finally {
- out.close();
}
}
@@ -1825,7 +1604,7 @@
*/
void usageError(String s) {
err.println(s);
- Info.USAGE_TRYHELP.print(err);
+ err.println(getMsg("main.usage.summary.try"));
}
/**
@@ -1934,16 +1713,6 @@
return tmpfile;
}
- private static byte[] readModuleInfo(InputStream zis) throws IOException {
- return zis.readAllBytes();
- }
-
- private static byte[] readModuleInfo(Path path) throws IOException {
- try (InputStream is = Files.newInputStream(path)) {
- return is.readAllBytes();
- }
- }
-
// Modular jar support
static String toString(Collection c,
@@ -1951,7 +1720,6 @@
CharSequence suffix ) {
if (c.isEmpty())
return "";
-
return c.stream().map(e -> e.toString())
.collect(joining(", ", prefix, suffix));
}
@@ -2045,136 +1813,84 @@
md.osVersion().ifPresent(v -> sb.append("\n operating-system-version " + v));
- if (hashes != null) {
- hashes.names().stream().sorted().forEach(
- mod -> sb.append("\n hashes ").append(mod).append(" ")
- .append(hashes.algorithm()).append(" ")
- .append(toHex(hashes.hashFor(mod))));
+ if (hashes != null) {
+ hashes.names().stream().sorted().forEach(
+ mod -> sb.append("\n hashes ").append(mod).append(" ")
+ .append(hashes.algorithm()).append(" ")
+ .append(toHex(hashes.hashFor(mod))));
}
output(sb.toString());
}
private static String toHex(byte[] ba) {
- StringBuilder sb = new StringBuilder(ba.length);
+ StringBuilder sb = new StringBuilder(ba.length << 1);
for (byte b: ba) {
sb.append(String.format("%02x", b & 0xff));
}
return sb.toString();
}
- private static String toBinaryName(String classname) {
+ static String toBinaryName(String classname) {
return (classname.replace('.', '/')) + ".class";
}
- /* A module must have the implementation class of the services it 'provides'. */
- private boolean checkServices(byte[] moduleInfoBytes)
+ private boolean checkModuleInfo(byte[] moduleInfoBytes, Set entries)
throws IOException
{
- ModuleDescriptor md = ModuleDescriptor.read(ByteBuffer.wrap(moduleInfoBytes));
- Set missing = md.provides()
- .stream()
- .map(Provides::providers)
- .flatMap(List::stream)
- .filter(p -> !jarEntries.contains(toBinaryName(p)))
- .collect(Collectors.toSet());
- if (missing.size() > 0) {
- missing.stream().forEach(s -> fatalError(formatMsg("error.missing.provider", s)));
- return false;
+ boolean ok = true;
+ if (moduleInfoBytes != null) { // no root module-info.class if null
+ try {
+ // ModuleDescriptor.read() checks open/exported pkgs vs packages
+ ModuleDescriptor md = ModuleDescriptor.read(ByteBuffer.wrap(moduleInfoBytes));
+ // A module must have the implementation class of the services it 'provides'.
+ if (md.provides().stream().map(Provides::providers).flatMap(List::stream)
+ .filter(p -> !entries.contains(toBinaryName(p)))
+ .peek(p -> fatalError(formatMsg("error.missing.provider", p)))
+ .count() != 0) {
+ ok = false;
+ }
+ } catch (InvalidModuleDescriptorException x) {
+ fatalError(x.getMessage());
+ ok = false;
+ }
}
- return true;
+ return ok;
}
/**
* Adds extended modules attributes to the given module-info's. The given
* Map values are updated in-place. Returns false if an error occurs.
*/
- private boolean addExtendedModuleAttributes(Map moduleInfos)
+ private void addExtendedModuleAttributes(Map moduleInfos,
+ Set packages)
throws IOException
{
- assert !moduleInfos.isEmpty() && moduleInfos.get(MODULE_INFO) != null;
-
- ByteBuffer bb = ByteBuffer.wrap(moduleInfos.get(MODULE_INFO));
- ModuleDescriptor rd = ModuleDescriptor.read(bb);
-
- concealedPackages = findConcealedPackages(rd);
-
for (Map.Entry e: moduleInfos.entrySet()) {
- ModuleDescriptor vd = ModuleDescriptor.read(ByteBuffer.wrap(e.getValue()));
- if (!(isValidVersionedDescriptor(vd, rd)))
- return false;
- e.setValue(extendedInfoBytes(rd, vd, e.getValue(), packages));
+ ModuleDescriptor md = ModuleDescriptor.read(ByteBuffer.wrap(e.getValue()));
+ e.setValue(extendedInfoBytes(md, e.getValue(), packages));
}
- return true;
- }
-
- private Set findConcealedPackages(ModuleDescriptor md) {
- Objects.requireNonNull(md);
- Set concealed = new HashSet<>(packages);
- md.exports().stream().map(Exports::source).forEach(concealed::remove);
- md.opens().stream().map(Opens::source).forEach(concealed::remove);
- return concealed;
- }
-
- private static boolean isPlatformModule(String name) {
- return name.startsWith("java.") || name.startsWith("jdk.");
}
- /**
- * Tells whether or not the given versioned module descriptor's attributes
- * are valid when compared against the given root module descriptor.
- *
- * A versioned module descriptor must be identical to the root module
- * descriptor, with two exceptions:
- * - A versioned descriptor can have different non-public `requires`
- * clauses of platform ( `java.*` and `jdk.*` ) modules, and
- * - A versioned descriptor can have different `uses` clauses, even of
- * service types defined outside of the platform modules.
- */
- private boolean isValidVersionedDescriptor(ModuleDescriptor vd,
- ModuleDescriptor rd)
- throws IOException
- {
- if (!rd.name().equals(vd.name())) {
- fatalError(getMsg("error.versioned.info.name.notequal"));
- return false;
- }
- if (!rd.requires().equals(vd.requires())) {
- Set rootRequires = rd.requires();
- for (Requires r : vd.requires()) {
- if (rootRequires.contains(r)) {
- continue;
- } else if (r.modifiers().contains(Requires.Modifier.TRANSITIVE)) {
- fatalError(getMsg("error.versioned.info.requires.transitive"));
+ static boolean isModuleInfoEntry(String name) {
+ // root or versioned module-info.class
+ if (name.endsWith(MODULE_INFO)) {
+ int end = name.length() - MODULE_INFO.length();
+ if (end == 0)
+ return true;
+ if (name.startsWith(VERSIONS_DIR)) {
+ int off = VERSIONS_DIR.length();
+ if (off == end) // meta-inf/versions/module-info.class
return false;
- } else if (!isPlatformModule(r.name())) {
- fatalError(getMsg("error.versioned.info.requires.added"));
- return false;
+ while (off < end - 1) {
+ char c = name.charAt(off++);
+ if (c < '0' || c > '9')
+ return false;
}
- }
- for (Requires r : rootRequires) {
- Set mdRequires = vd.requires();
- if (mdRequires.contains(r)) {
- continue;
- } else if (!isPlatformModule(r.name())) {
- fatalError(getMsg("error.versioned.info.requires.dropped"));
- return false;
- }
+ return name.charAt(off) == '/';
}
}
- if (!rd.exports().equals(vd.exports())) {
- fatalError(getMsg("error.versioned.info.exports.notequal"));
- return false;
- }
- if (!rd.opens().equals(vd.opens())) {
- fatalError(getMsg("error.versioned.info.opens.notequal"));
- return false;
- }
- if (!rd.provides().equals(vd.provides())) {
- fatalError(getMsg("error.versioned.info.provides.notequal"));
- return false;
- }
- return true;
+ return false;
}
/**
@@ -2185,8 +1901,7 @@
* then the corresponding class file attributes are added to the
* module-info here.
*/
- private byte[] extendedInfoBytes(ModuleDescriptor rootDescriptor,
- ModuleDescriptor md,
+ private byte[] extendedInfoBytes(ModuleDescriptor md,
byte[] miBytes,
Set packages)
throws IOException
@@ -2201,14 +1916,10 @@
// --main-class
if (ename != null)
extender.mainClass(ename);
- else if (rootDescriptor.mainClass().isPresent())
- extender.mainClass(rootDescriptor.mainClass().get());
// --module-version
if (moduleVersion != null)
extender.version(moduleVersion);
- else if (rootDescriptor.version().isPresent())
- extender.version(rootDescriptor.version().get());
// --hash-modules
if (modulesToHash != null) {
@@ -2218,8 +1929,7 @@
if (moduleHashes != null) {
extender.hashes(moduleHashes);
} else {
- // should it issue warning or silent?
- System.out.println("warning: no module is recorded in hash in " + mn);
+ warn("warning: no module is recorded in hash in " + mn);
}
}
@@ -2235,10 +1945,9 @@
* Compute and record hashes
*/
private class Hasher {
+ final ModuleHashesBuilder hashesBuilder;
final ModuleFinder finder;
- final Map moduleNameToPath;
final Set modules;
- final Configuration configuration;
Hasher(ModuleDescriptor descriptor, String fname) throws IOException {
// Create a module finder that finds the modular JAR
// being created/updated
@@ -2268,119 +1977,46 @@
}
});
- // Determine the modules that matches the modulesToHash pattern
- this.modules = moduleFinder.findAll().stream()
- .map(moduleReference -> moduleReference.descriptor().name())
+ // Determine the modules that matches the pattern {@code modulesToHash}
+ Set roots = finder.findAll().stream()
+ .map(ref -> ref.descriptor().name())
.filter(mn -> modulesToHash.matcher(mn).find())
.collect(Collectors.toSet());
- // a map from a module name to Path of the modular JAR
- this.moduleNameToPath = moduleFinder.findAll().stream()
- .map(ModuleReference::descriptor)
- .map(ModuleDescriptor::name)
- .collect(Collectors.toMap(Function.identity(), mn -> moduleToPath(mn)));
-
- Configuration config = null;
- try {
- config = Configuration.empty()
- .resolveRequires(ModuleFinder.ofSystem(), finder, modules);
- } catch (ResolutionException e) {
- // should it throw an error? or emit a warning
- System.out.println("warning: " + e.getMessage());
+ // use system module path unless it creates a modular JAR for
+ // a module that is present in the system image e.g. upgradeable
+ // module
+ ModuleFinder system;
+ String name = descriptor.name();
+ if (name != null && ModuleFinder.ofSystem().find(name).isPresent()) {
+ system = ModuleFinder.of();
+ } else {
+ system = ModuleFinder.ofSystem();
}
- this.configuration = config;
- }
+ // get a resolved module graph
+ Configuration config =
+ Configuration.empty().resolveRequires(system, finder, roots);
- /**
- * Compute hashes of the modules that depend upon the specified
- * module directly or indirectly.
- */
- ModuleHashes computeHashes(String name) {
- // the transposed graph includes all modules in the resolved graph
- Map> graph = transpose();
+ // filter modules resolved from the system module finder
+ this.modules = config.modules().stream()
+ .map(ResolvedModule::name)
+ .filter(mn -> roots.contains(mn) && !system.find(mn).isPresent())
+ .collect(Collectors.toSet());
- // find the modules that transitively depend upon the specified name
- Deque deque = new ArrayDeque<>();
- deque.add(name);
- Set mods = visitNodes(graph, deque);
-
- // filter modules matching the pattern specified in --hash-modules,
- // as well as the modular jar file that is being created / updated
- Map modulesForHash = mods.stream()
- .filter(mn -> !mn.equals(name) && modules.contains(mn))
- .collect(Collectors.toMap(Function.identity(), moduleNameToPath::get));
-
- if (modulesForHash.isEmpty())
- return null;
-
- return ModuleHashes.generate(modulesForHash, "SHA-256");
+ this.hashesBuilder = new ModuleHashesBuilder(config, modules);
}
/**
- * Returns all nodes traversed from the given roots.
+ * Compute hashes of the specified module.
+ *
+ * It records the hashing modules that depend upon the specified
+ * module directly or indirectly.
*/
- private Set visitNodes(Map> graph,
- Deque roots) {
- Set visited = new HashSet<>();
- while (!roots.isEmpty()) {
- String mn = roots.pop();
- if (!visited.contains(mn)) {
- visited.add(mn);
-
- // the given roots may not be part of the graph
- if (graph.containsKey(mn)) {
- for (String dm : graph.get(mn)) {
- if (!visited.contains(dm))
- roots.push(dm);
- }
- }
- }
- }
- return visited;
- }
-
- /**
- * Returns a transposed graph from the resolved module graph.
- */
- private Map> transpose() {
- Map> transposedGraph = new HashMap<>();
- Deque deque = new ArrayDeque<>(modules);
+ ModuleHashes computeHashes(String name) {
+ if (hashesBuilder == null)
+ return null;
- Set visited = new HashSet<>();
- while (!deque.isEmpty()) {
- String mn = deque.pop();
- if (!visited.contains(mn)) {
- visited.add(mn);
-
- // add an empty set
- transposedGraph.computeIfAbsent(mn, _k -> new HashSet<>());
-
- ResolvedModule resolvedModule = configuration.findModule(mn).get();
- for (ResolvedModule dm : resolvedModule.reads()) {
- String name = dm.name();
- if (!visited.contains(name)) {
- deque.push(name);
- }
- // reverse edge
- transposedGraph.computeIfAbsent(name, _k -> new HashSet<>())
- .add(mn);
- }
- }
- }
- return transposedGraph;
- }
-
- private Path moduleToPath(String name) {
- ModuleReference mref = moduleFinder.find(name).orElseThrow(
- () -> new InternalError(formatMsg2("error.hash.dep",name , name)));
-
- URI uri = mref.location().get();
- Path path = Paths.get(uri);
- String fn = path.getFileName().toString();
- if (!fn.endsWith(".jar")) {
- throw new UnsupportedOperationException(path + " is not a modular JAR");
- }
- return path;
+ return hashesBuilder.computeHashes(Set.of(name)).get(name);
}
}
}
diff -r be8643ebe865 -r 6665640c56cf jdk/src/jdk.jartool/share/classes/sun/tools/jar/Validator.java
--- a/jdk/src/jdk.jartool/share/classes/sun/tools/jar/Validator.java Fri Jan 13 01:36:02 2017 +0000
+++ b/jdk/src/jdk.jartool/share/classes/sun/tools/jar/Validator.java Wed Jul 05 22:41:30 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 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
@@ -25,32 +25,120 @@
package sun.tools.jar;
+import java.io.File;
import java.io.IOException;
import java.io.InputStream;
+import java.lang.module.InvalidModuleDescriptorException;
+import java.lang.module.ModuleDescriptor;
+import java.lang.module.ModuleDescriptor.Exports;
+import java.lang.module.InvalidModuleDescriptorException;
+import java.lang.module.ModuleDescriptor.Opens;
+import java.lang.module.ModuleDescriptor.Provides;
+import java.lang.module.ModuleDescriptor.Requires;
+import java.util.Collections;
+import java.util.Comparator;
import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
import java.util.Map;
+import java.util.Set;
import java.util.function.Consumer;
import java.util.jar.JarEntry;
import java.util.jar.JarFile;
+import java.util.zip.ZipEntry;
-final class Validator implements Consumer {
+import static java.util.jar.JarFile.MANIFEST_NAME;
+import static sun.tools.jar.Main.VERSIONS_DIR;
+import static sun.tools.jar.Main.MODULE_INFO;
+import static sun.tools.jar.Main.getMsg;
+import static sun.tools.jar.Main.formatMsg;
+import static sun.tools.jar.Main.formatMsg2;
+import static sun.tools.jar.Main.toBinaryName;
+import static sun.tools.jar.Main.isModuleInfoEntry;
+
+final class Validator {
private final static boolean DEBUG = Boolean.getBoolean("jar.debug");
private final Map fps = new HashMap<>();
- private final int vdlen = Main.VERSIONS_DIR.length();
+ private static final int vdlen = VERSIONS_DIR.length();
private final Main main;
private final JarFile jf;
private int oldVersion = -1;
private String currentTopLevelName;
private boolean isValid = true;
+ private Set concealedPkgs;
+ private ModuleDescriptor md;
- Validator(Main main, JarFile jf) {
+ private Validator(Main main, JarFile jf) {
this.main = main;
this.jf = jf;
+ loadModuleDescriptor();
+ }
+
+ static boolean validate(Main main, JarFile jf) throws IOException {
+ return new Validator(main, jf).validate();
+ }
+
+ private boolean validate() {
+ try {
+ jf.stream()
+ .filter(e -> !e.isDirectory() &&
+ !e.getName().equals(MANIFEST_NAME))
+ .sorted(entryComparator)
+ .forEachOrdered(e -> validate(e));
+ return isValid;
+ } catch (InvalidJarException e) {
+ error(formatMsg("error.validator.bad.entry.name", e.getMessage()));
+ }
+ return false;
+ }
+
+ private static class InvalidJarException extends RuntimeException {
+ private static final long serialVersionUID = -3642329147299217726L;
+ InvalidJarException(String msg) {
+ super(msg);
+ }
}
- boolean isValid() {
- return isValid;
- }
+ // sort base entries before versioned entries, and sort entry classes with
+ // nested classes so that the top level class appears before the associated
+ // nested class
+ private static Comparator entryComparator = (je1, je2) -> {
+ String s1 = je1.getName();
+ String s2 = je2.getName();
+ if (s1.equals(s2)) return 0;
+ boolean b1 = s1.startsWith(VERSIONS_DIR);
+ boolean b2 = s2.startsWith(VERSIONS_DIR);
+ if (b1 && !b2) return 1;
+ if (!b1 && b2) return -1;
+ int n = 0; // starting char for String compare
+ if (b1 && b2) {
+ // normally strings would be sorted so "10" goes before "9", but
+ // version number strings need to be sorted numerically
+ n = VERSIONS_DIR.length(); // skip the common prefix
+ int i1 = s1.indexOf('/', n);
+ int i2 = s1.indexOf('/', n);
+ if (i1 == -1) throw new InvalidJarException(s1);
+ if (i2 == -1) throw new InvalidJarException(s2);
+ // shorter version numbers go first
+ if (i1 != i2) return i1 - i2;
+ // otherwise, handle equal length numbers below
+ }
+ int l1 = s1.length();
+ int l2 = s2.length();
+ int lim = Math.min(l1, l2);
+ for (int k = n; k < lim; k++) {
+ char c1 = s1.charAt(k);
+ char c2 = s2.charAt(k);
+ if (c1 != c2) {
+ // change natural ordering so '.' comes before '$'
+ // i.e. top level classes come before nested classes
+ if (c1 == '$' && c2 == '.') return 1;
+ if (c1 == '.' && c2 == '$') return -1;
+ return c1 - c2;
+ }
+ }
+ return l1 - l2;
+ };
/*
* Validator has state and assumes entries provided to accept are ordered
@@ -59,7 +147,7 @@
* classes must be ordered so that the top level class is before the associated
* nested class(es).
*/
- public void accept(JarEntry je) {
+ public void validate(JarEntry je) {
String entryName = je.getName();
// directories are always accepted
@@ -68,13 +156,20 @@
return;
}
+ // validate the versioned module-info
+ if (isModuleInfoEntry(entryName)) {
+ if (entryName.length() != MODULE_INFO.length())
+ checkModuleDescriptor(je);
+ return;
+ }
+
// figure out the version and basename from the JarEntry
int version;
String basename;
- if (entryName.startsWith(Main.VERSIONS_DIR)) {
+ if (entryName.startsWith(VERSIONS_DIR)) {
int n = entryName.indexOf("/", vdlen);
if (n == -1) {
- main.error(Main.formatMsg("error.validator.version.notnumber", entryName));
+ error(formatMsg("error.validator.version.notnumber", entryName));
isValid = false;
return;
}
@@ -82,12 +177,12 @@
try {
version = Integer.parseInt(v);
} catch (NumberFormatException x) {
- main.error(Main.formatMsg("error.validator.version.notnumber", entryName));
+ error(formatMsg("error.validator.version.notnumber", entryName));
isValid = false;
return;
}
if (n == entryName.length()) {
- main.error(Main.formatMsg("error.validator.entryname.tooshort", entryName));
+ error(formatMsg("error.validator.entryname.tooshort", entryName));
isValid = false;
return;
}
@@ -108,7 +203,7 @@
try (InputStream is = jf.getInputStream(je)) {
fp = new FingerPrint(basename, is.readAllBytes());
} catch (IOException x) {
- main.error(x.getMessage());
+ error(x.getMessage());
isValid = false;
return;
}
@@ -123,7 +218,7 @@
fps.put(internalName, fp);
return;
}
- main.error(Main.formatMsg("error.validator.isolated.nested.class", entryName));
+ error(formatMsg("error.validator.isolated.nested.class", entryName));
isValid = false;
return;
}
@@ -153,11 +248,11 @@
}
if (fp.isPublicClass()) {
if (!isConcealed(internalName)) {
- main.error(Main.formatMsg("error.validator.new.public.class", entryName));
+ error(Main.formatMsg("error.validator.new.public.class", entryName));
isValid = false;
return;
}
- main.warn(Main.formatMsg("warn.validator.concealed.public.class", entryName));
+ warn(formatMsg("warn.validator.concealed.public.class", entryName));
debug("%s is a public class entry in a concealed package", entryName);
}
debug("%s is a non-public class entry", entryName);
@@ -173,7 +268,7 @@
// are the two classes/resources identical?
if (fp.isIdentical(matchFp)) {
- main.warn(Main.formatMsg("warn.validator.identical.entry", entryName));
+ warn(formatMsg("warn.validator.identical.entry", entryName));
return; // it's okay, just takes up room
}
debug("sha1 not equal -- different bytes");
@@ -188,12 +283,12 @@
}
debug("%s is a class entry", entryName);
if (!fp.isCompatibleVersion(matchFp)) {
- main.error(Main.formatMsg("error.validator.incompatible.class.version", entryName));
+ error(formatMsg("error.validator.incompatible.class.version", entryName));
isValid = false;
return;
}
if (!fp.isSameAPI(matchFp)) {
- main.error(Main.formatMsg("error.validator.different.api", entryName));
+ error(formatMsg("error.validator.different.api", entryName));
isValid = false;
return;
}
@@ -208,17 +303,118 @@
}
debug("%s is a resource", entryName);
- main.warn(Main.formatMsg("warn.validator.resources.with.same.name", entryName));
+ warn(formatMsg("warn.validator.resources.with.same.name", entryName));
fps.put(internalName, fp);
return;
}
+ private void loadModuleDescriptor() {
+ ZipEntry je = jf.getEntry(MODULE_INFO);
+ if (je != null) {
+ try (InputStream jis = jf.getInputStream(je)) {
+ md = ModuleDescriptor.read(jis);
+ concealedPkgs = new HashSet<>(md.packages());
+ md.exports().stream().map(Exports::source).forEach(concealedPkgs::remove);
+ md.opens().stream().map(Opens::source).forEach(concealedPkgs::remove);
+ return;
+ } catch (Exception x) {
+ error(x.getMessage() + " : " + je.getName());
+ this.isValid = false;
+ }
+ }
+ md = null;
+ concealedPkgs = Collections.emptySet();
+ }
+
+ private static boolean isPlatformModule(String name) {
+ return name.startsWith("java.") || name.startsWith("jdk.");
+ }
+
+ /**
+ * Checks whether or not the given versioned module descriptor's attributes
+ * are valid when compared against the root module descriptor.
+ *
+ * A versioned module descriptor must be identical to the root module
+ * descriptor, with two exceptions:
+ * - A versioned descriptor can have different non-public `requires`
+ * clauses of platform ( `java.*` and `jdk.*` ) modules, and
+ * - A versioned descriptor can have different `uses` clauses, even of
+ * service types defined outside of the platform modules.
+ */
+ private void checkModuleDescriptor(JarEntry je) {
+ try (InputStream is = jf.getInputStream(je)) {
+ ModuleDescriptor root = this.md;
+ ModuleDescriptor md = null;
+ try {
+ md = ModuleDescriptor.read(is);
+ } catch (InvalidModuleDescriptorException x) {
+ error(x.getMessage());
+ isValid = false;
+ return;
+ }
+ if (root == null) {
+ this.md = md;
+ } else {
+ if (!root.name().equals(md.name())) {
+ error(getMsg("error.versioned.info.name.notequal"));
+ isValid = false;
+ }
+ if (!root.requires().equals(md.requires())) {
+ Set rootRequires = root.requires();
+ for (Requires r : md.requires()) {
+ if (rootRequires.contains(r))
+ continue;
+ if (r.modifiers().contains(Requires.Modifier.TRANSITIVE)) {
+ error(getMsg("error.versioned.info.requires.transitive"));
+ isValid = false;
+ } else if (!isPlatformModule(r.name())) {
+ error(getMsg("error.versioned.info.requires.added"));
+ isValid = false;
+ }
+ }
+ for (Requires r : rootRequires) {
+ Set mdRequires = md.requires();
+ if (mdRequires.contains(r))
+ continue;
+ if (!isPlatformModule(r.name())) {
+ error(getMsg("error.versioned.info.requires.dropped"));
+ isValid = false;
+ }
+ }
+ }
+ if (!root.exports().equals(md.exports())) {
+ error(getMsg("error.versioned.info.exports.notequal"));
+ isValid = false;
+ }
+ if (!root.opens().equals(md.opens())) {
+ error(getMsg("error.versioned.info.opens.notequal"));
+ isValid = false;
+ }
+ if (!root.provides().equals(md.provides())) {
+ error(getMsg("error.versioned.info.provides.notequal"));
+ isValid = false;
+ }
+ if (!root.mainClass().equals(md.mainClass())) {
+ error(formatMsg("error.validator.info.manclass.notequal", je.getName()));
+ isValid = false;
+ }
+ if (!root.version().equals(md.version())) {
+ error(formatMsg("error.validator.info.version.notequal", je.getName()));
+ isValid = false;
+ }
+ }
+ } catch (IOException x) {
+ error(x.getMessage());
+ isValid = false;
+ }
+ }
+
private boolean checkInternalName(String entryName, String basename, String internalName) {
String className = className(basename);
if (internalName.equals(className)) {
return true;
}
- main.error(Main.formatMsg2("error.validator.names.mismatch",
+ error(formatMsg2("error.validator.names.mismatch",
entryName, internalName.replace("/", ".")));
return false;
}
@@ -231,7 +427,7 @@
return true;
}
debug("top level class was not accepted");
- main.error(Main.formatMsg("error.validator.isolated.nested.class", entryName));
+ error(formatMsg("error.validator.isolated.nested.class", entryName));
return false;
}
@@ -240,16 +436,24 @@
}
private boolean isConcealed(String internalName) {
- if (main.concealedPackages.isEmpty()) {
+ if (concealedPkgs.isEmpty()) {
return false;
}
int idx = internalName.lastIndexOf('/');
String pkgName = idx != -1 ? internalName.substring(0, idx).replace('/', '.') : "";
- return main.concealedPackages.contains(pkgName);
+ return concealedPkgs.contains(pkgName);
}
private void debug(String fmt, Object... args) {
if (DEBUG) System.err.format(fmt, args);
}
+
+ private void error(String msg) {
+ main.error(msg);
+ }
+
+ private void warn(String msg) {
+ main.warn(msg);
+ }
+
}
-
diff -r be8643ebe865 -r 6665640c56cf jdk/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar.properties
--- a/jdk/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar.properties Fri Jan 13 01:36:02 2017 +0000
+++ b/jdk/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar.properties Wed Jul 05 22:41:30 2017 +0200
@@ -66,23 +66,6 @@
Unexpected module descriptor {0}
error.module.descriptor.not.found=\
Module descriptor not found
-error.versioned.info.without.root=\
- module-info.class found in a versioned directory without module-info.class \
- in the root
-error.versioned.info.name.notequal=\
- module-info.class in a versioned directory contains incorrect name
-error.versioned.info.requires.transitive=\
- module-info.class in a versioned directory contains additional "requires transitive"
-error.versioned.info.requires.added=\
- module-info.class in a versioned directory contains additional "requires"
-error.versioned.info.requires.dropped=\
- module-info.class in a versioned directory contains missing "requires"
-error.versioned.info.exports.notequal=\
- module-info.class in a versioned directory contains different "exports"
-error.versioned.info.opens.notequal=\
- module-info.class in a versioned directory contains different "opens"
-error.versioned.info.provides.notequal=\
- module-info.class in a versioned directory contains different "provides"
error.invalid.versioned.module.attribute=\
Invalid module descriptor attribute {0}
error.missing.provider=\
@@ -113,6 +96,24 @@
entry: {0}, contains a class with different api from earlier version
error.validator.names.mismatch=\
entry: {0}, contains a class with internal name {1}, names do not match
+error.validator.info.name.notequal=\
+ module-info.class in a versioned directory contains incorrect name
+error.validator.info.requires.transitive=\
+ module-info.class in a versioned directory contains additional "requires transitive"
+error.validator.info.requires.added=\
+ module-info.class in a versioned directory contains additional "requires"
+error.validator.info.requires.dropped=\
+ module-info.class in a versioned directory contains missing "requires"
+error.validator.info.exports.notequal=\
+ module-info.class in a versioned directory contains different "exports"
+error.validator.info.opens.notequal=\
+ module-info.class in a versioned directory contains different "opens"
+error.validator.info.provides.notequal=\
+ module-info.class in a versioned directory contains different "provides"
+error.validator.info.version.notequal=\
+ {0}: module-info.class in a versioned directory contains different "version"
+error.validator.info.manclass.notequal=\
+ {0}: module-info.class in a versioned directory contains different "main-class"
warn.validator.identical.entry=\
Warning: entry {0} contains a class that\n\
is identical to an entry already in the jar
@@ -122,6 +123,8 @@
Warning: entry {0} is a public class\n\
in a concealed package, placing this jar on the class path will result\n\
in incompatible public interfaces
+warn.release.unexpected.versioned.entry=\
+ unexpected versioned entry {0}
out.added.manifest=\
added manifest
out.added.module-info=\
diff -r be8643ebe865 -r 6665640c56cf jdk/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_de.properties
--- a/jdk/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_de.properties Fri Jan 13 01:36:02 2017 +0000
+++ b/jdk/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_de.properties Wed Jul 05 22:41:30 2017 +0200
@@ -42,13 +42,13 @@
error.module.options.without.info=--module-version oder --hash-modules ohne module-info.class
error.unexpected.module-info=Unerwarteter Moduldeskriptor {0}
error.module.descriptor.not.found=Moduldeskriptor nicht gefunden
-error.versioned.info.without.root=module-info.class in einem versionierten Verzeichnis gefunden, in der Root ist module-info.class jedoch nicht vorhanden
-error.versioned.info.name.notequal=module-info.class in einem versionierten Verzeichnis enth\u00E4lt falschen Namen
-error.versioned.info.requires.public=module-info.class in einem versionierten Verzeichnis enth\u00E4lt zus\u00E4tzlichen "requires public"
-error.versioned.info.requires.added=module-info.class in einem versionierten Verzeichnis enth\u00E4lt zus\u00E4tzlichen "requires"
-error.versioned.info.requires.dropped=module-info.class in einem versionierten Verzeichnis enth\u00E4lt fehlenden "requires"
-error.versioned.info.exports.notequal=module-info.class in einem versionierten Verzeichnis enth\u00E4lt unterschiedliche "exports"
-error.versioned.info.provides.notequal=module-info.class in einem versionierten Verzeichnis enth\u00E4lt unterschiedliche "provides"
+error.validator.info.without.root=module-info.class in einem versionierten Verzeichnis gefunden, in der Root ist module-info.class jedoch nicht vorhanden
+error.validator.info.name.notequal=module-info.class in einem versionierten Verzeichnis enth\u00E4lt falschen Namen
+error.validator.info.requires.public=module-info.class in einem versionierten Verzeichnis enth\u00E4lt zus\u00E4tzlichen "requires public"
+error.validator.info.requires.added=module-info.class in einem versionierten Verzeichnis enth\u00E4lt zus\u00E4tzlichen "requires"
+error.validator.info.requires.dropped=module-info.class in einem versionierten Verzeichnis enth\u00E4lt fehlenden "requires"
+error.validator.info.exports.notequal=module-info.class in einem versionierten Verzeichnis enth\u00E4lt unterschiedliche "exports"
+error.validator.info.provides.notequal=module-info.class in einem versionierten Verzeichnis enth\u00E4lt unterschiedliche "provides"
error.invalid.versioned.module.attribute=Ung\u00FCltiges Moduldeskriptorattribut {0}
error.missing.provider=Serviceprovider nicht gefunden: {0}
error.release.value.notnumber=Release {0} nicht g\u00FCltig
diff -r be8643ebe865 -r 6665640c56cf jdk/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_es.properties
--- a/jdk/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_es.properties Fri Jan 13 01:36:02 2017 +0000
+++ b/jdk/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_es.properties Wed Jul 05 22:41:30 2017 +0200
@@ -42,13 +42,13 @@
error.module.options.without.info=Uno de --module-version o -hash-modules sin module-info.class
error.unexpected.module-info=Descriptor de m\u00F3dulo inesperado {0}
error.module.descriptor.not.found=No se ha encontrado el descriptor de m\u00F3dulo
-error.versioned.info.without.root=Se ha encontrado module-info.class en un directorio con versi\u00F3n sin module-info.class en la ra\u00EDz
-error.versioned.info.name.notequal=module-info.class en un directorio con versi\u00F3n contiene un nombre incorrecto
-error.versioned.info.requires.public=module-info.class en un directorio con versiones contiene "requires public" adicionales
-error.versioned.info.requires.added=module-info.class en un directorio con versi\u00F3n contiene "requires" adicionales
-error.versioned.info.requires.dropped=module-info.class en un directorio con versiones contiene "requires" que faltan
-error.versioned.info.exports.notequal=module-info.class en un directorio con versiones contiene "exports" diferentes
-error.versioned.info.provides.notequal=module-info.class en un directorio con versiones contiene "provides" diferentes
+error.validator.info.without.root=Se ha encontrado module-info.class en un directorio con versi\u00F3n sin module-info.class en la ra\u00EDz
+error.validator.info.name.notequal=module-info.class en un directorio con versi\u00F3n contiene un nombre incorrecto
+error.validator.info.requires.public=module-info.class en un directorio con versiones contiene "requires public" adicionales
+error.validator.info.requires.added=module-info.class en un directorio con versi\u00F3n contiene "requires" adicionales
+error.validator.info.requires.dropped=module-info.class en un directorio con versiones contiene "requires" que faltan
+error.validator.info.exports.notequal=module-info.class en un directorio con versiones contiene "exports" diferentes
+error.validator.info.provides.notequal=module-info.class en un directorio con versiones contiene "provides" diferentes
error.invalid.versioned.module.attribute=Atributo de descriptor de m\u00F3dulo no v\u00E1lido {0}
error.missing.provider=No se ha encontrado el proveedor de servicios: {0}
error.release.value.notnumber=versi\u00F3n {0} no v\u00E1lida
diff -r be8643ebe865 -r 6665640c56cf jdk/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_fr.properties
--- a/jdk/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_fr.properties Fri Jan 13 01:36:02 2017 +0000
+++ b/jdk/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_fr.properties Wed Jul 05 22:41:30 2017 +0200
@@ -42,13 +42,13 @@
error.module.options.without.info=Une des options --module-version ou --hash-modules sans module-info.class
error.unexpected.module-info=Descripteur de module {0} inattendu
error.module.descriptor.not.found=Descripteur de module introuvable
-error.versioned.info.without.root=module-info.class a \u00E9t\u00E9 d\u00E9tect\u00E9 dans un r\u00E9pertoire avec num\u00E9ro de version sans module-info.class dans la racine
-error.versioned.info.name.notequal=module-info.class dans un r\u00E9pertoire avec num\u00E9ro de version contient un nom incorrect
-error.versioned.info.requires.public=module-info.class dans un r\u00E9pertoire avec num\u00E9ro de version contient des mots-cl\u00E9s "requires public" suppl\u00E9mentaires
-error.versioned.info.requires.added=module-info.class dans un r\u00E9pertoire avec num\u00E9ro de version contient des mots-cl\u00E9s "requires" suppl\u00E9mentaires
-error.versioned.info.requires.dropped=module-info.class dans un r\u00E9pertoire avec num\u00E9ro de version contient des mots-cl\u00E9s "requires" manquants
-error.versioned.info.exports.notequal=module-info.class dans un r\u00E9pertoire avec num\u00E9ro de version contient des mots-cl\u00E9s "exports" diff\u00E9rents
-error.versioned.info.provides.notequal=module-info.class dans un r\u00E9pertoire avec num\u00E9ro de version contient des mots-cl\u00E9s "provides" diff\u00E9rents
+error.validator.info.without.root=module-info.class a \u00E9t\u00E9 d\u00E9tect\u00E9 dans un r\u00E9pertoire avec num\u00E9ro de version sans module-info.class dans la racine
+error.validator.info.name.notequal=module-info.class dans un r\u00E9pertoire avec num\u00E9ro de version contient un nom incorrect
+error.validator.info.requires.public=module-info.class dans un r\u00E9pertoire avec num\u00E9ro de version contient des mots-cl\u00E9s "requires public" suppl\u00E9mentaires
+error.validator.info.requires.added=module-info.class dans un r\u00E9pertoire avec num\u00E9ro de version contient des mots-cl\u00E9s "requires" suppl\u00E9mentaires
+error.validator.info.requires.dropped=module-info.class dans un r\u00E9pertoire avec num\u00E9ro de version contient des mots-cl\u00E9s "requires" manquants
+error.validator.info.exports.notequal=module-info.class dans un r\u00E9pertoire avec num\u00E9ro de version contient des mots-cl\u00E9s "exports" diff\u00E9rents
+error.validator.info.provides.notequal=module-info.class dans un r\u00E9pertoire avec num\u00E9ro de version contient des mots-cl\u00E9s "provides" diff\u00E9rents
error.invalid.versioned.module.attribute=Attribut de descripteur de module non valide {0}
error.missing.provider=Fournisseur de services introuvable : {0}
error.release.value.notnumber=version {0} non valide
diff -r be8643ebe865 -r 6665640c56cf jdk/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_it.properties
--- a/jdk/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_it.properties Fri Jan 13 01:36:02 2017 +0000
+++ b/jdk/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_it.properties Wed Jul 05 22:41:30 2017 +0200
@@ -42,13 +42,13 @@
error.module.options.without.info=Una delle opzioni --module-version o --hash-modules non contiene module-info.class
error.unexpected.module-info=Descrittore di modulo {0} imprevisto
error.module.descriptor.not.found=Descrittore di modulo non trovato
-error.versioned.info.without.root=module-info.class trovato in una directory con controllo delle versioni senza module-info.class nella radice
-error.versioned.info.name.notequal=module-info.class in una directory con controllo delle versioni contiene un nome errato
-error.versioned.info.requires.public=module-info.class in una directory con controllo delle versioni contiene valori "requires public" aggiuntivi
-error.versioned.info.requires.added=module-info.class in una directory con controllo delle versioni contiene valori "requires" aggiuntivi
-error.versioned.info.requires.dropped=module-info.class in una directory con controllo delle versioni contiene valori "requires" mancanti
-error.versioned.info.exports.notequal=module-info.class in una directory con controllo delle versioni contiene "exports" differenti
-error.versioned.info.provides.notequal=module-info.class in una directory con controllo delle versioni contiene valori "provides" differenti
+error.validator.info.without.root=module-info.class trovato in una directory con controllo delle versioni senza module-info.class nella radice
+error.validator.info.name.notequal=module-info.class in una directory con controllo delle versioni contiene un nome errato
+error.validator.info.requires.public=module-info.class in una directory con controllo delle versioni contiene valori "requires public" aggiuntivi
+error.validator.info.requires.added=module-info.class in una directory con controllo delle versioni contiene valori "requires" aggiuntivi
+error.validator.info.requires.dropped=module-info.class in una directory con controllo delle versioni contiene valori "requires" mancanti
+error.validator.info.exports.notequal=module-info.class in una directory con controllo delle versioni contiene "exports" differenti
+error.validator.info.provides.notequal=module-info.class in una directory con controllo delle versioni contiene valori "provides" differenti
error.invalid.versioned.module.attribute=Attributo descrittore del modulo {0} non valido.
error.missing.provider=Provider di servizi non trovato: {0}
error.release.value.notnumber=release {0} non valida
diff -r be8643ebe865 -r 6665640c56cf jdk/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_ja.properties
--- a/jdk/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_ja.properties Fri Jan 13 01:36:02 2017 +0000
+++ b/jdk/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_ja.properties Wed Jul 05 22:41:30 2017 +0200
@@ -42,13 +42,13 @@
error.module.options.without.info=--module-version\u307E\u305F\u306F--hash-modules\u306E\u3044\u305A\u308C\u304B\u3067module-info.class\u304C\u3042\u308A\u307E\u305B\u3093
error.unexpected.module-info=\u4E88\u671F\u3057\u306A\u3044\u30E2\u30B8\u30E5\u30FC\u30EB\u30FB\u30C7\u30A3\u30B9\u30AF\u30EA\u30D7\u30BF{0}
error.module.descriptor.not.found=\u30E2\u30B8\u30E5\u30FC\u30EB\u30FB\u30C7\u30A3\u30B9\u30AF\u30EA\u30D7\u30BF\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093
-error.versioned.info.without.root=module-info.class\u304C\u3001\u30EB\u30FC\u30C8\u306Bmodule-info.class\u306E\u306A\u3044\u30D0\u30FC\u30B8\u30E7\u30CB\u30F3\u30B0\u3055\u308C\u305F\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306B\u898B\u3064\u304B\u308A\u307E\u3057\u305F
-error.versioned.info.name.notequal=\u30D0\u30FC\u30B8\u30E7\u30CB\u30F3\u30B0\u3055\u308C\u305F\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306Emodule-info.class\u306B\u6B63\u3057\u304F\u306A\u3044\u540D\u524D\u304C\u542B\u307E\u308C\u3066\u3044\u307E\u3059
-error.versioned.info.requires.public=\u30D0\u30FC\u30B8\u30E7\u30CB\u30F3\u30B0\u3055\u308C\u305F\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306Emodule-info.class\u306B\u8FFD\u52A0\u306E"requires public"\u304C\u542B\u307E\u308C\u3066\u3044\u307E\u3059
-error.versioned.info.requires.added=\u30D0\u30FC\u30B8\u30E7\u30CB\u30F3\u30B0\u3055\u308C\u305F\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306Emodule-info.class\u306B\u8FFD\u52A0\u306E"requires"\u304C\u542B\u307E\u308C\u3066\u3044\u307E\u3059
-error.versioned.info.requires.dropped=\u30D0\u30FC\u30B8\u30E7\u30CB\u30F3\u30B0\u3055\u308C\u305F\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306Emodule-info.class\u306B\u6B20\u843D\u3057\u3066\u3044\u308B"requires"\u304C\u542B\u307E\u308C\u3066\u3044\u307E\u3059
-error.versioned.info.exports.notequal=\u30D0\u30FC\u30B8\u30E7\u30CB\u30F3\u30B0\u3055\u308C\u305F\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306Emodule-info.class\u306B\u7570\u306A\u308B"exports"\u304C\u542B\u307E\u308C\u3066\u3044\u307E\u3059
-error.versioned.info.provides.notequal=\u30D0\u30FC\u30B8\u30E7\u30CB\u30F3\u30B0\u3055\u308C\u305F\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306Emodule-info.class\u306B\u7570\u306A\u308B"provides"\u304C\u542B\u307E\u308C\u3066\u3044\u307E\u3059
+error.validator.info.without.root=module-info.class\u304C\u3001\u30EB\u30FC\u30C8\u306Bmodule-info.class\u306E\u306A\u3044\u30D0\u30FC\u30B8\u30E7\u30CB\u30F3\u30B0\u3055\u308C\u305F\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306B\u898B\u3064\u304B\u308A\u307E\u3057\u305F
+error.validator.info.name.notequal=\u30D0\u30FC\u30B8\u30E7\u30CB\u30F3\u30B0\u3055\u308C\u305F\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306Emodule-info.class\u306B\u6B63\u3057\u304F\u306A\u3044\u540D\u524D\u304C\u542B\u307E\u308C\u3066\u3044\u307E\u3059
+error.validator.info.requires.public=\u30D0\u30FC\u30B8\u30E7\u30CB\u30F3\u30B0\u3055\u308C\u305F\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306Emodule-info.class\u306B\u8FFD\u52A0\u306E"requires public"\u304C\u542B\u307E\u308C\u3066\u3044\u307E\u3059
+error.validator.info.requires.added=\u30D0\u30FC\u30B8\u30E7\u30CB\u30F3\u30B0\u3055\u308C\u305F\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306Emodule-info.class\u306B\u8FFD\u52A0\u306E"requires"\u304C\u542B\u307E\u308C\u3066\u3044\u307E\u3059
+error.validator.info.requires.dropped=\u30D0\u30FC\u30B8\u30E7\u30CB\u30F3\u30B0\u3055\u308C\u305F\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306Emodule-info.class\u306B\u6B20\u843D\u3057\u3066\u3044\u308B"requires"\u304C\u542B\u307E\u308C\u3066\u3044\u307E\u3059
+error.validator.info.exports.notequal=\u30D0\u30FC\u30B8\u30E7\u30CB\u30F3\u30B0\u3055\u308C\u305F\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306Emodule-info.class\u306B\u7570\u306A\u308B"exports"\u304C\u542B\u307E\u308C\u3066\u3044\u307E\u3059
+error.validator.info.provides.notequal=\u30D0\u30FC\u30B8\u30E7\u30CB\u30F3\u30B0\u3055\u308C\u305F\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306Emodule-info.class\u306B\u7570\u306A\u308B"provides"\u304C\u542B\u307E\u308C\u3066\u3044\u307E\u3059
error.invalid.versioned.module.attribute=\u30E2\u30B8\u30E5\u30FC\u30EB\u30FB\u30C7\u30A3\u30B9\u30AF\u30EA\u30D7\u30BF\u5C5E\u6027{0}\u304C\u7121\u52B9\u3067\u3059
error.missing.provider=\u30B5\u30FC\u30D3\u30B9\u30FB\u30D7\u30ED\u30D0\u30A4\u30C0\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093: {0}
error.release.value.notnumber=\u30EA\u30EA\u30FC\u30B9{0}\u306F\u6709\u52B9\u3067\u306F\u3042\u308A\u307E\u305B\u3093
diff -r be8643ebe865 -r 6665640c56cf jdk/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_ko.properties
--- a/jdk/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_ko.properties Fri Jan 13 01:36:02 2017 +0000
+++ b/jdk/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_ko.properties Wed Jul 05 22:41:30 2017 +0200
@@ -42,13 +42,13 @@
error.module.options.without.info=module-info.class \uC5C6\uC774 --module-version \uB610\uB294 --hash-modules \uC911 \uD558\uB098
error.unexpected.module-info=\uC608\uC0C1\uCE58 \uC54A\uC740 \uBAA8\uB4C8 \uAE30\uC220\uC790 {0}
error.module.descriptor.not.found=\uBAA8\uB4C8 \uAE30\uC220\uC790\uB97C \uCC3E\uC744 \uC218 \uC5C6\uC74C
-error.versioned.info.without.root=\uB8E8\uD2B8\uC5D0\uC11C module-info.class \uC5C6\uC774 \uBC84\uC804 \uC9C0\uC815\uB41C \uB514\uB809\uD1A0\uB9AC\uC5D0\uC11C module-info.class\uAC00 \uBC1C\uACAC\uB428
-error.versioned.info.name.notequal=\uBC84\uC804 \uC9C0\uC815\uB41C \uB514\uB809\uD1A0\uB9AC\uC758 module-info.class\uC5D0 \uC798\uBABB\uB41C \uC774\uB984\uC774 \uD3EC\uD568\uB428
-error.versioned.info.requires.public=\uBC84\uC804 \uC9C0\uC815\uB41C \uB514\uB809\uD1A0\uB9AC\uC758 module-info.class\uC5D0 \uCD94\uAC00 "requires public" \uD56D\uBAA9\uC774 \uD3EC\uD568\uB428
-error.versioned.info.requires.added=\uBC84\uC804 \uC9C0\uC815\uB41C \uB514\uB809\uD1A0\uB9AC\uC758 module-info.class\uC5D0 \uCD94\uAC00 "requires" \uD56D\uBAA9\uC774 \uD3EC\uD568\uB428
-error.versioned.info.requires.dropped=\uBC84\uC804 \uC9C0\uC815\uB41C \uB514\uB809\uD1A0\uB9AC\uC758 module-info.class\uC5D0 \uB204\uB77D\uB41C "requires" \uD56D\uBAA9\uC774 \uD3EC\uD568\uB428
-error.versioned.info.exports.notequal=\uBC84\uC804 \uC9C0\uC815\uB41C \uB514\uB809\uD1A0\uB9AC\uC758 module-info.class\uC5D0 \uB2E4\uB978 "exports" \uD56D\uBAA9\uC774 \uD3EC\uD568\uB428
-error.versioned.info.provides.notequal=\uBC84\uC804 \uC9C0\uC815\uB41C \uB514\uB809\uD1A0\uB9AC\uC758 module-info.class\uC5D0 \uB2E4\uB978 "provides" \uD56D\uBAA9\uC774 \uD3EC\uD568\uB428
+error.validator.info.without.root=\uB8E8\uD2B8\uC5D0\uC11C module-info.class \uC5C6\uC774 \uBC84\uC804 \uC9C0\uC815\uB41C \uB514\uB809\uD1A0\uB9AC\uC5D0\uC11C module-info.class\uAC00 \uBC1C\uACAC\uB428
+error.validator.info.name.notequal=\uBC84\uC804 \uC9C0\uC815\uB41C \uB514\uB809\uD1A0\uB9AC\uC758 module-info.class\uC5D0 \uC798\uBABB\uB41C \uC774\uB984\uC774 \uD3EC\uD568\uB428
+error.validator.info.requires.public=\uBC84\uC804 \uC9C0\uC815\uB41C \uB514\uB809\uD1A0\uB9AC\uC758 module-info.class\uC5D0 \uCD94\uAC00 "requires public" \uD56D\uBAA9\uC774 \uD3EC\uD568\uB428
+error.validator.info.requires.added=\uBC84\uC804 \uC9C0\uC815\uB41C \uB514\uB809\uD1A0\uB9AC\uC758 module-info.class\uC5D0 \uCD94\uAC00 "requires" \uD56D\uBAA9\uC774 \uD3EC\uD568\uB428
+error.validator.info.requires.dropped=\uBC84\uC804 \uC9C0\uC815\uB41C \uB514\uB809\uD1A0\uB9AC\uC758 module-info.class\uC5D0 \uB204\uB77D\uB41C "requires" \uD56D\uBAA9\uC774 \uD3EC\uD568\uB428
+error.validator.info.exports.notequal=\uBC84\uC804 \uC9C0\uC815\uB41C \uB514\uB809\uD1A0\uB9AC\uC758 module-info.class\uC5D0 \uB2E4\uB978 "exports" \uD56D\uBAA9\uC774 \uD3EC\uD568\uB428
+error.validator.info.provides.notequal=\uBC84\uC804 \uC9C0\uC815\uB41C \uB514\uB809\uD1A0\uB9AC\uC758 module-info.class\uC5D0 \uB2E4\uB978 "provides" \uD56D\uBAA9\uC774 \uD3EC\uD568\uB428
error.invalid.versioned.module.attribute=\uBD80\uC801\uD569\uD55C \uBAA8\uB4C8 \uAE30\uC220\uC790 \uC18D\uC131 {0}
error.missing.provider=\uC11C\uBE44\uC2A4 \uC81C\uACF5\uC790\uB97C \uCC3E\uC744 \uC218 \uC5C6\uC74C: {0}
error.release.value.notnumber=\uB9B4\uB9AC\uC2A4 {0}\uC774(\uAC00) \uBD80\uC801\uD569\uD568
diff -r be8643ebe865 -r 6665640c56cf jdk/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_pt_BR.properties
--- a/jdk/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_pt_BR.properties Fri Jan 13 01:36:02 2017 +0000
+++ b/jdk/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_pt_BR.properties Wed Jul 05 22:41:30 2017 +0200
@@ -42,13 +42,13 @@
error.module.options.without.info=Um dentre --module-version ou --hash-modules est\u00E1 sem module-info.class
error.unexpected.module-info=Descritor de m\u00F3dulo inesperado {0}
error.module.descriptor.not.found=Descritor de m\u00F3dulo n\u00E3o encontrado
-error.versioned.info.without.root=module-info.class encontrado em um diret\u00F3rio com controle de vers\u00E3o sem module-info.class na raiz
-error.versioned.info.name.notequal=module-info.class em um diret\u00F3rio com controle de vers\u00E3o cont\u00E9m nome incorreto
-error.versioned.info.requires.public=module-info.class em um diret\u00F3rio com controle de vers\u00E3o cont\u00E9m "requires public" adicional
-error.versioned.info.requires.added=module-info.class em um diret\u00F3rio com controle de vers\u00E3o cont\u00E9m "requires" adicional
-error.versioned.info.requires.dropped=module-info.class em um diret\u00F3rio com controle de vers\u00E3o falta "requires"
-error.versioned.info.exports.notequal=module-info.class em um diret\u00F3rio com controle de vers\u00E3o cont\u00E9m "exports" diferente
-error.versioned.info.provides.notequal=module-info.class em um diret\u00F3rio com controle de vers\u00E3o cont\u00E9m "provides" diferente
+error.validator.info.without.root=module-info.class encontrado em um diret\u00F3rio com controle de vers\u00E3o sem module-info.class na raiz
+error.validator.info.name.notequal=module-info.class em um diret\u00F3rio com controle de vers\u00E3o cont\u00E9m nome incorreto
+error.validator.info.requires.public=module-info.class em um diret\u00F3rio com controle de vers\u00E3o cont\u00E9m "requires public" adicional
+error.validator.info.requires.added=module-info.class em um diret\u00F3rio com controle de vers\u00E3o cont\u00E9m "requires" adicional
+error.validator.info.requires.dropped=module-info.class em um diret\u00F3rio com controle de vers\u00E3o falta "requires"
+error.validator.info.exports.notequal=module-info.class em um diret\u00F3rio com controle de vers\u00E3o cont\u00E9m "exports" diferente
+error.validator.info.provides.notequal=module-info.class em um diret\u00F3rio com controle de vers\u00E3o cont\u00E9m "provides" diferente
error.invalid.versioned.module.attribute=Atributo {0} de descritor de m\u00F3dulo inv\u00E1lido
error.missing.provider=Prestador de servi\u00E7os n\u00E3o encontrado: {0}
error.release.value.notnumber=release {0} n\u00E3o v\u00E1lida
diff -r be8643ebe865 -r 6665640c56cf jdk/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_sv.properties
--- a/jdk/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_sv.properties Fri Jan 13 01:36:02 2017 +0000
+++ b/jdk/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_sv.properties Wed Jul 05 22:41:30 2017 +0200
@@ -42,13 +42,13 @@
error.module.options.without.info=--module-version eller --hash-modules utan module-info.class
error.unexpected.module-info=Ov\u00E4ntad moduldeskriptor, {0}
error.module.descriptor.not.found=Moduldeskriptorn hittades inte
-error.versioned.info.without.root=module-info.class hittades i en versionshanterad katalog utan module-info.class i roten
-error.versioned.info.name.notequal=module-info.class i en versionshanterad katalog inneh\u00E5ller ett felaktigt namn
-error.versioned.info.requires.public=module-info.class i en versionshanterad katalog inneh\u00E5ller fler "requires public"
-error.versioned.info.requires.added=module-info.class i en versionshanterad katalog inneh\u00E5ller fler "requires"
-error.versioned.info.requires.dropped=module-info.class i en versionshanterad katalog inneh\u00E5ller saknade "requires"
-error.versioned.info.exports.notequal=module-info.class i en versionshanterad katalog inneh\u00E5ller olika "exports"
-error.versioned.info.provides.notequal=module-info.class i en versionshanterad katalog inneh\u00E5ller olika "provides"
+error.validator.info.without.root=module-info.class hittades i en versionshanterad katalog utan module-info.class i roten
+error.validator.info.name.notequal=module-info.class i en versionshanterad katalog inneh\u00E5ller ett felaktigt namn
+error.validator.info.requires.public=module-info.class i en versionshanterad katalog inneh\u00E5ller fler "requires public"
+error.validator.info.requires.added=module-info.class i en versionshanterad katalog inneh\u00E5ller fler "requires"
+error.validator.info.requires.dropped=module-info.class i en versionshanterad katalog inneh\u00E5ller saknade "requires"
+error.validator.info.exports.notequal=module-info.class i en versionshanterad katalog inneh\u00E5ller olika "exports"
+error.validator.info.provides.notequal=module-info.class i en versionshanterad katalog inneh\u00E5ller olika "provides"
error.invalid.versioned.module.attribute=Ogiltigt attribut f\u00F6r moduldeskriptor, {0}
error.missing.provider=Tj\u00E4nsteleverant\u00F6ren hittades inte: {0}
error.release.value.notnumber=utg\u00E5va {0} \u00E4r inte giltig
diff -r be8643ebe865 -r 6665640c56cf jdk/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_zh_CN.properties
--- a/jdk/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_zh_CN.properties Fri Jan 13 01:36:02 2017 +0000
+++ b/jdk/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_zh_CN.properties Wed Jul 05 22:41:30 2017 +0200
@@ -42,13 +42,13 @@
error.module.options.without.info=--module-version \u6216 --hash-modules \u4E4B\u4E00\u6CA1\u6709 module-info.class
error.unexpected.module-info=\u610F\u5916\u7684\u6A21\u5757\u63CF\u8FF0\u7B26 {0}
error.module.descriptor.not.found=\u627E\u4E0D\u5230\u6A21\u5757\u63CF\u8FF0\u7B26
-error.versioned.info.without.root=\u5728\u7248\u672C\u5316\u76EE\u5F55\u4E2D\u627E\u5230\u4E86 module-info.class, \u4F46\u6839\u4E2D\u6CA1\u6709 module-info.class
-error.versioned.info.name.notequal=\u7248\u672C\u5316\u76EE\u5F55\u4E2D\u7684 module-info.class \u5305\u542B\u4E0D\u6B63\u786E\u7684\u540D\u79F0
-error.versioned.info.requires.public=\u7248\u672C\u5316\u76EE\u5F55\u4E2D\u7684 module-info.class \u5305\u542B\u989D\u5916\u7684 "requires public"
-error.versioned.info.requires.added=\u7248\u672C\u5316\u76EE\u5F55\u4E2D\u7684 module-info.class \u5305\u542B\u989D\u5916\u7684 "requires"
-error.versioned.info.requires.dropped=\u7248\u672C\u5316\u76EE\u5F55\u4E2D\u7684 module-info.class \u5305\u542B\u7F3A\u5C11\u7684 "requires"
-error.versioned.info.exports.notequal=\u7248\u672C\u5316\u76EE\u5F55\u4E2D\u7684 module-info.class \u5305\u542B\u4E0D\u540C\u7684 "exports"
-error.versioned.info.provides.notequal=\u7248\u672C\u5316\u76EE\u5F55\u4E2D\u7684 module-info.class \u5305\u542B\u4E0D\u540C\u7684 "provides"
+error.validator.info.without.root=\u5728\u7248\u672C\u5316\u76EE\u5F55\u4E2D\u627E\u5230\u4E86 module-info.class, \u4F46\u6839\u4E2D\u6CA1\u6709 module-info.class
+error.validator.info.name.notequal=\u7248\u672C\u5316\u76EE\u5F55\u4E2D\u7684 module-info.class \u5305\u542B\u4E0D\u6B63\u786E\u7684\u540D\u79F0
+error.validator.info.requires.public=\u7248\u672C\u5316\u76EE\u5F55\u4E2D\u7684 module-info.class \u5305\u542B\u989D\u5916\u7684 "requires public"
+error.validator.info.requires.added=\u7248\u672C\u5316\u76EE\u5F55\u4E2D\u7684 module-info.class \u5305\u542B\u989D\u5916\u7684 "requires"
+error.validator.info.requires.dropped=\u7248\u672C\u5316\u76EE\u5F55\u4E2D\u7684 module-info.class \u5305\u542B\u7F3A\u5C11\u7684 "requires"
+error.validator.info.exports.notequal=\u7248\u672C\u5316\u76EE\u5F55\u4E2D\u7684 module-info.class \u5305\u542B\u4E0D\u540C\u7684 "exports"
+error.validator.info.provides.notequal=\u7248\u672C\u5316\u76EE\u5F55\u4E2D\u7684 module-info.class \u5305\u542B\u4E0D\u540C\u7684 "provides"
error.invalid.versioned.module.attribute=\u65E0\u6548\u7684\u6A21\u5757\u63CF\u8FF0\u7B26\u5C5E\u6027 {0}
error.missing.provider=\u672A\u627E\u5230\u670D\u52A1\u63D0\u4F9B\u65B9: {0}
error.release.value.notnumber=\u53D1\u884C\u7248 {0} \u65E0\u6548
diff -r be8643ebe865 -r 6665640c56cf jdk/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_zh_TW.properties
--- a/jdk/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_zh_TW.properties Fri Jan 13 01:36:02 2017 +0000
+++ b/jdk/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_zh_TW.properties Wed Jul 05 22:41:30 2017 +0200
@@ -42,13 +42,13 @@
error.module.options.without.info=--module-version \u6216 --hash-modules \u5176\u4E2D\u4E00\u500B\u6C92\u6709 module-info.class
error.unexpected.module-info=\u672A\u9810\u671F\u7684\u6A21\u7D44\u63CF\u8FF0\u5340 {0}
error.module.descriptor.not.found=\u627E\u4E0D\u5230\u6A21\u7D44\u63CF\u8FF0\u5340
-error.versioned.info.without.root=\u5728\u5DF2\u555F\u52D5\u591A\u7248\u672C\u529F\u80FD\u76EE\u9304\u4E2D\u767C\u73FE module-info.class\uFF0C\u4F46\u662F\u6839\u4E2D\u6C92\u6709 module-info.class
-error.versioned.info.name.notequal=\u5DF2\u555F\u52D5\u591A\u7248\u672C\u529F\u80FD\u76EE\u9304\u4E2D\u7684 module-info.class \u5305\u542B\u4E0D\u6B63\u78BA\u7684\u540D\u7A31
-error.versioned.info.requires.public=\u5DF2\u555F\u52D5\u591A\u7248\u672C\u529F\u80FD\u76EE\u9304\u4E2D\u7684 module-info.class \u5305\u542B\u984D\u5916\u7684 "requires public"
-error.versioned.info.requires.added=\u5DF2\u555F\u52D5\u591A\u7248\u672C\u529F\u80FD\u76EE\u9304\u4E2D\u7684 module-info.class \u5305\u542B\u984D\u5916\u7684 "requires"
-error.versioned.info.requires.dropped=\u5DF2\u555F\u52D5\u591A\u7248\u672C\u529F\u80FD\u76EE\u9304\u4E2D\u7684 module-info.class \u5305\u542B\u907A\u6F0F\u7684 "requires"
-error.versioned.info.exports.notequal=\u5DF2\u555F\u52D5\u591A\u7248\u672C\u529F\u80FD\u76EE\u9304\u4E2D\u7684 module-info.class \u5305\u542B\u4E0D\u540C\u7684 "exports"
-error.versioned.info.provides.notequal=\u5DF2\u555F\u52D5\u591A\u7248\u672C\u529F\u80FD\u76EE\u9304\u4E2D\u7684 module-info.class \u5305\u542B\u4E0D\u540C\u7684 "provides"
+error.validator.info.without.root=\u5728\u5DF2\u555F\u52D5\u591A\u7248\u672C\u529F\u80FD\u76EE\u9304\u4E2D\u767C\u73FE module-info.class\uFF0C\u4F46\u662F\u6839\u4E2D\u6C92\u6709 module-info.class
+error.validator.info.name.notequal=\u5DF2\u555F\u52D5\u591A\u7248\u672C\u529F\u80FD\u76EE\u9304\u4E2D\u7684 module-info.class \u5305\u542B\u4E0D\u6B63\u78BA\u7684\u540D\u7A31
+error.validator.info.requires.public=\u5DF2\u555F\u52D5\u591A\u7248\u672C\u529F\u80FD\u76EE\u9304\u4E2D\u7684 module-info.class \u5305\u542B\u984D\u5916\u7684 "requires public"
+error.validator.info.requires.added=\u5DF2\u555F\u52D5\u591A\u7248\u672C\u529F\u80FD\u76EE\u9304\u4E2D\u7684 module-info.class \u5305\u542B\u984D\u5916\u7684 "requires"
+error.validator.info.requires.dropped=\u5DF2\u555F\u52D5\u591A\u7248\u672C\u529F\u80FD\u76EE\u9304\u4E2D\u7684 module-info.class \u5305\u542B\u907A\u6F0F\u7684 "requires"
+error.validator.info.exports.notequal=\u5DF2\u555F\u52D5\u591A\u7248\u672C\u529F\u80FD\u76EE\u9304\u4E2D\u7684 module-info.class \u5305\u542B\u4E0D\u540C\u7684 "exports"
+error.validator.info.provides.notequal=\u5DF2\u555F\u52D5\u591A\u7248\u672C\u529F\u80FD\u76EE\u9304\u4E2D\u7684 module-info.class \u5305\u542B\u4E0D\u540C\u7684 "provides"
error.invalid.versioned.module.attribute=\u6A21\u7D44\u63CF\u8FF0\u5340\u5C6C\u6027 {0} \u7121\u6548
error.missing.provider=\u627E\u4E0D\u5230\u670D\u52D9\u63D0\u4F9B\u8005: {0}
error.release.value.notnumber=\u7248\u672C {0} \u7121\u6548
diff -r be8643ebe865 -r 6665640c56cf jdk/src/jdk.jlink/share/classes/jdk/tools/jmod/JmodTask.java
--- a/jdk/src/jdk.jlink/share/classes/jdk/tools/jmod/JmodTask.java Fri Jan 13 01:36:02 2017 +0000
+++ b/jdk/src/jdk.jlink/share/classes/jdk/tools/jmod/JmodTask.java Wed Jul 05 22:41:30 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 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
@@ -58,13 +58,10 @@
import java.nio.file.StandardCopyOption;
import java.nio.file.attribute.BasicFileAttributes;
import java.text.MessageFormat;
-import java.util.ArrayDeque;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.Comparator;
-import java.util.Deque;
-import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedHashMap;
import java.util.List;
@@ -101,6 +98,7 @@
import jdk.internal.joptsimple.ValueConverter;
import jdk.internal.loader.ResourceHelper;
import jdk.internal.module.ModuleHashes;
+import jdk.internal.module.ModuleHashesBuilder;
import jdk.internal.module.ModuleInfo;
import jdk.internal.module.ModuleInfoExtender;
import jdk.internal.module.ModulePath;
@@ -286,7 +284,27 @@
}
private boolean hashModules() {
- return new Hasher(options.moduleFinder).run();
+ if (options.dryrun) {
+ out.println("Dry run:");
+ }
+
+ Hasher hasher = new Hasher(options.moduleFinder);
+ hasher.computeHashes().forEach((mn, hashes) -> {
+ if (options.dryrun) {
+ out.format("%s%n", mn);
+ hashes.names().stream()
+ .sorted()
+ .forEach(name -> out.format(" hashes %s %s %s%n",
+ name, hashes.algorithm(), toHex(hashes.hashFor(name))));
+ } else {
+ try {
+ hasher.updateModuleInfo(mn, hashes);
+ } catch (IOException ex) {
+ throw new UncheckedIOException(ex);
+ }
+ }
+ });
+ return true;
}
private boolean describe() throws IOException {
@@ -377,7 +395,7 @@
// create jmod with temporary name to avoid it being examined
// when scanning the module path
Path target = options.jmodFile;
- Path tempTarget = target.resolveSibling(target.getFileName() + ".tmp");
+ Path tempTarget = Files.createTempFile(target.getFileName().toString(), ".tmp");
try {
try (JmodOutputStream jos = JmodOutputStream.newOutputStream(tempTarget)) {
jmod.write(jos);
@@ -411,7 +429,6 @@
final String osArch = options.osArch;
final String osVersion = options.osVersion;
final List excludes = options.excludes;
- final Hasher hasher = hasher();
final ModuleResolution moduleResolution = options.moduleResolution;
JmodFileWriter() { }
@@ -514,8 +531,17 @@
if (moduleVersion != null)
extender.version(moduleVersion);
- if (hasher != null) {
- ModuleHashes moduleHashes = hasher.computeHashes(descriptor.name());
+ // --hash-modules
+ if (options.modulesToHash != null) {
+ // To compute hashes, it creates a Configuration to resolve
+ // a module graph. The post-resolution check requires
+ // the packages in ModuleDescriptor be available for validation.
+ ModuleDescriptor md;
+ try (InputStream is = miSupplier.get()) {
+ md = ModuleDescriptor.read(is, () -> packages);
+ }
+
+ ModuleHashes moduleHashes = computeHashes(md);
if (moduleHashes != null) {
extender.hashes(moduleHashes);
} else {
@@ -557,50 +583,34 @@
* The jmod file is being created and does not exist in the
* given modulepath.
*/
- private Hasher hasher() {
- if (options.modulesToHash == null)
- return null;
-
- try {
- Supplier miSupplier = newModuleInfoSupplier();
- if (miSupplier == null) {
- throw new IOException(MODULE_INFO + " not found");
+ private ModuleHashes computeHashes(ModuleDescriptor descriptor) {
+ String mn = descriptor.name();
+ URI uri = options.jmodFile.toUri();
+ ModuleReference mref = new ModuleReference(descriptor, uri) {
+ @Override
+ public ModuleReader open() {
+ throw new UnsupportedOperationException("opening " + mn);
}
+ };
- ModuleDescriptor descriptor;
- try (InputStream in = miSupplier.get()) {
- descriptor = ModuleDescriptor.read(in);
- }
-
- URI uri = options.jmodFile.toUri();
- ModuleReference mref = new ModuleReference(descriptor, uri) {
+ // compose a module finder with the module path and also
+ // a module finder that can find the jmod file being created
+ ModuleFinder finder = ModuleFinder.compose(options.moduleFinder,
+ new ModuleFinder() {
@Override
- public ModuleReader open() {
- throw new UnsupportedOperationException();
+ public Optional find(String name) {
+ if (descriptor.name().equals(name))
+ return Optional.of(mref);
+ else return Optional.empty();
}
- };
- // compose a module finder with the module path and also
- // a module finder that can find the jmod file being created
- ModuleFinder finder = ModuleFinder.compose(options.moduleFinder,
- new ModuleFinder() {
- @Override
- public Optional find(String name) {
- if (descriptor.name().equals(name))
- return Optional.of(mref);
- else return Optional.empty();
- }
+ @Override
+ public Set findAll() {
+ return Collections.singleton(mref);
+ }
+ });
- @Override
- public Set findAll() {
- return Collections.singleton(mref);
- }
- });
-
- return new Hasher(finder);
- } catch (IOException e) {
- throw new UncheckedIOException(e);
- }
+ return new Hasher(mn, finder).computeHashes().get(mn);
}
/**
@@ -789,192 +799,93 @@
* Compute and record hashes
*/
private class Hasher {
- final ModuleFinder moduleFinder;
- final Map moduleNameToPath;
+ final Configuration configuration;
+ final ModuleHashesBuilder hashesBuilder;
final Set modules;
- final Configuration configuration;
- final boolean dryrun = options.dryrun;
+ final String moduleName; // a specific module to record hashes, if set
+
+ /**
+ * This constructor is for jmod hash command.
+ *
+ * This Hasher will determine which modules to record hashes, i.e.
+ * the module in a subgraph of modules to be hashed and that
+ * has no outgoing edges. It will record in each of these modules,
+ * say `M`, with the the hashes of modules that depend upon M
+ * directly or indirectly matching the specified --hash-modules pattern.
+ */
Hasher(ModuleFinder finder) {
- this.moduleFinder = finder;
+ this(null, finder);
+ }
+
+ /**
+ * Constructs a Hasher to compute hashes.
+ *
+ * If a module name `M` is specified, it will compute the hashes of
+ * modules that depend upon M directly or indirectly matching the
+ * specified --hash-modules pattern and record in the ModuleHashes
+ * attribute in M's module-info.class.
+ *
+ * @param name name of the module to record hashes
+ * @param finder module finder for the specified --module-path
+ */
+ Hasher(String name, ModuleFinder finder) {
// Determine the modules that matches the pattern {@code modulesToHash}
- this.modules = moduleFinder.findAll().stream()
+ Set roots = finder.findAll().stream()
.map(mref -> mref.descriptor().name())
.filter(mn -> options.modulesToHash.matcher(mn).find())
.collect(Collectors.toSet());
- // a map from a module name to Path of the packaged module
- this.moduleNameToPath = moduleFinder.findAll().stream()
- .map(mref -> mref.descriptor().name())
- .collect(Collectors.toMap(Function.identity(), mn -> moduleToPath(mn)));
-
+ // use system module path unless it creates a JMOD file for
+ // a module that is present in the system image e.g. upgradeable
+ // module
+ ModuleFinder system;
+ if (name != null && ModuleFinder.ofSystem().find(name).isPresent()) {
+ system = ModuleFinder.of();
+ } else {
+ system = ModuleFinder.ofSystem();
+ }
// get a resolved module graph
Configuration config = null;
try {
- config = Configuration.empty()
- .resolveRequires(ModuleFinder.ofSystem(), moduleFinder, modules);
+ config = Configuration.empty().resolveRequires(system, finder, roots);
} catch (ResolutionException e) {
- warning("warn.module.resolution.fail", e.getMessage());
+ throw new CommandException("err.module.resolution.fail", e.getMessage());
}
+
+ this.moduleName = name;
this.configuration = config;
+
+ // filter modules resolved from the system module finder
+ this.modules = config.modules().stream()
+ .map(ResolvedModule::name)
+ .filter(mn -> roots.contains(mn) && !system.find(mn).isPresent())
+ .collect(Collectors.toSet());
+
+ this.hashesBuilder = new ModuleHashesBuilder(config, modules);
}
/**
- * This method is for jmod hash command.
+ * Returns a map of a module M to record hashes of the modules
+ * that depend upon M directly or indirectly.
*
- * Identify the base modules in the module graph, i.e. no outgoing edge
- * to any of the modules to be hashed.
+ * For jmod hash command, the returned map contains one entry
+ * for each module M that has no outgoing edges to any of the
+ * modules matching the specified --hash-modules pattern.
*
- * For each base module M, compute the hashes of all modules that depend
- * upon M directly or indirectly. Then update M's module-info.class
- * to record the hashes.
+ * Each entry represents a leaf node in a connected subgraph containing
+ * M and other candidate modules from the module graph where M's outgoing
+ * edges to any module other than the ones matching the specified
+ * --hash-modules pattern are excluded.
*/
- boolean run() {
- if (configuration == null)
- return false;
-
- // transposed graph containing the the packaged modules and
- // its transitive dependences matching --hash-modules
- Map> graph = new HashMap<>();
- for (String root : modules) {
- Deque deque = new ArrayDeque<>();
- deque.add(root);
- Set visited = new HashSet<>();
- while (!deque.isEmpty()) {
- String mn = deque.pop();
- if (!visited.contains(mn)) {
- visited.add(mn);
-
- if (modules.contains(mn))
- graph.computeIfAbsent(mn, _k -> new HashSet<>());
-
- ResolvedModule resolvedModule = configuration.findModule(mn).get();
- for (ResolvedModule dm : resolvedModule.reads()) {
- String name = dm.name();
- if (!visited.contains(name)) {
- deque.push(name);
- }
-
- // reverse edge
- if (modules.contains(name) && modules.contains(mn)) {
- graph.computeIfAbsent(name, _k -> new HashSet<>()).add(mn);
- }
- }
- }
- }
- }
-
- if (dryrun)
- out.println("Dry run:");
-
- // each node in a transposed graph is a matching packaged module
- // in which the hash of the modules that depend upon it is recorded
- graph.entrySet().stream()
- .filter(e -> !e.getValue().isEmpty())
- .forEach(e -> {
- String mn = e.getKey();
- Map modulesForHash = e.getValue().stream()
- .collect(Collectors.toMap(Function.identity(),
- moduleNameToPath::get));
- ModuleHashes hashes = ModuleHashes.generate(modulesForHash, "SHA-256");
- if (dryrun) {
- out.format("%s%n", mn);
- hashes.names().stream()
- .sorted()
- .forEach(name -> out.format(" hashes %s %s %s%n",
- name, hashes.algorithm(), hashes.hashFor(name)));
- } else {
- try {
- updateModuleInfo(mn, hashes);
- } catch (IOException ex) {
- throw new UncheckedIOException(ex);
- }
- }
- });
- return true;
- }
-
- /**
- * Compute hashes of the specified module.
- *
- * It records the hashing modules that depend upon the specified
- * module directly or indirectly.
- */
- ModuleHashes computeHashes(String name) {
- if (configuration == null)
+ Map computeHashes() {
+ if (hashesBuilder == null)
return null;
- // the transposed graph includes all modules in the resolved graph
- Map> graph = transpose();
-
- // find the modules that transitively depend upon the specified name
- Deque deque = new ArrayDeque<>();
- deque.add(name);
- Set mods = visitNodes(graph, deque);
-
- // filter modules matching the pattern specified --hash-modules
- // as well as itself as the jmod file is being generated
- Map modulesForHash = mods.stream()
- .filter(mn -> !mn.equals(name) && modules.contains(mn))
- .collect(Collectors.toMap(Function.identity(), moduleNameToPath::get));
-
- if (modulesForHash.isEmpty())
- return null;
-
- return ModuleHashes.generate(modulesForHash, "SHA-256");
- }
-
- /**
- * Returns all nodes traversed from the given roots.
- */
- private Set visitNodes(Map> graph,
- Deque roots) {
- Set visited = new HashSet<>();
- while (!roots.isEmpty()) {
- String mn = roots.pop();
- if (!visited.contains(mn)) {
- visited.add(mn);
- // the given roots may not be part of the graph
- if (graph.containsKey(mn)) {
- for (String dm : graph.get(mn)) {
- if (!visited.contains(dm)) {
- roots.push(dm);
- }
- }
- }
- }
+ if (moduleName != null) {
+ return hashesBuilder.computeHashes(Set.of(moduleName));
+ } else {
+ return hashesBuilder.computeHashes(modules);
}
- return visited;
- }
-
- /**
- * Returns a transposed graph from the resolved module graph.
- */
- private Map> transpose() {
- Map> transposedGraph = new HashMap<>();
- Deque deque = new ArrayDeque<>(modules);
-
- Set visited = new HashSet<>();
- while (!deque.isEmpty()) {
- String mn = deque.pop();
- if (!visited.contains(mn)) {
- visited.add(mn);
-
- transposedGraph.computeIfAbsent(mn, _k -> new HashSet<>());
-
- ResolvedModule resolvedModule = configuration.findModule(mn).get();
- for (ResolvedModule dm : resolvedModule.reads()) {
- String name = dm.name();
- if (!visited.contains(name)) {
- deque.push(name);
- }
-
- // reverse edge
- transposedGraph.computeIfAbsent(name, _k -> new HashSet<>())
- .add(mn);
- }
- }
- }
- return transposedGraph;
}
/**
@@ -993,11 +904,11 @@
extender.write(out);
}
- private void updateModuleInfo(String name, ModuleHashes moduleHashes)
+ void updateModuleInfo(String name, ModuleHashes moduleHashes)
throws IOException
{
- Path target = moduleNameToPath.get(name);
- Path tempTarget = target.resolveSibling(target.getFileName() + ".tmp");
+ Path target = moduleToPath(name);
+ Path tempTarget = Files.createTempFile(target.getFileName().toString(), ".tmp");
try {
if (target.getFileName().toString().endsWith(".jmod")) {
updateJmodFile(target, tempTarget, moduleHashes);
@@ -1075,10 +986,10 @@
}
private Path moduleToPath(String name) {
- ModuleReference mref = moduleFinder.find(name).orElseThrow(
+ ResolvedModule rm = configuration.findModule(name).orElseThrow(
() -> new InternalError("Selected module " + name + " not on module path"));
- URI uri = mref.location().get();
+ URI uri = rm.reference().location().get();
Path path = Paths.get(uri);
String fn = path.getFileName().toString();
if (!fn.endsWith(".jar") && !fn.endsWith(".jmod")) {
@@ -1088,34 +999,58 @@
}
}
- static class ClassPathConverter implements ValueConverter {
- static final ValueConverter INSTANCE = new ClassPathConverter();
+ /**
+ * An abstract converter that given a string representing a list of paths,
+ * separated by the File.pathSeparator, returns a List of java.nio.Path's.
+ * Specific subclasses should do whatever validation is required on the
+ * individual path elements, if any.
+ */
+ static abstract class AbstractPathConverter implements ValueConverter> {
+ @Override
+ public List convert(String value) {
+ List paths = new ArrayList<>();
+ String[] pathElements = value.split(File.pathSeparator);
+ for (String pathElement : pathElements) {
+ paths.add(toPath(pathElement));
+ }
+ return paths;
+ }
+
+ @SuppressWarnings("unchecked")
+ @Override
+ public Class> valueType() {
+ return (Class>)(Object)List.class;
+ }
+
+ @Override public String valuePattern() { return "path"; }
+
+ abstract Path toPath(String path);
+ }
+
+ static class ClassPathConverter extends AbstractPathConverter {
+ static final ValueConverter> INSTANCE = new ClassPathConverter();
@Override
- public Path convert(String value) {
+ public Path toPath(String value) {
try {
Path path = CWD.resolve(value);
if (Files.notExists(path))
throw new CommandException("err.path.not.found", path);
- if (! (Files.isDirectory(path) ||
- (Files.isRegularFile(path) && path.toString().endsWith(".jar"))))
+ if (!(Files.isDirectory(path) ||
+ (Files.isRegularFile(path) && path.toString().endsWith(".jar"))))
throw new CommandException("err.invalid.class.path.entry", path);
return path;
} catch (InvalidPathException x) {
throw new CommandException("err.path.not.valid", value);
}
}
-
- @Override public Class valueType() { return Path.class; }
-
- @Override public String valuePattern() { return "path"; }
}
- static class DirPathConverter implements ValueConverter {
- static final ValueConverter INSTANCE = new DirPathConverter();
+ static class DirPathConverter extends AbstractPathConverter {
+ static final ValueConverter> INSTANCE = new DirPathConverter();
@Override
- public Path convert(String value) {
+ public Path toPath(String value) {
try {
Path path = CWD.resolve(value);
if (Files.notExists(path))
@@ -1127,10 +1062,6 @@
throw new CommandException("err.path.not.valid", value);
}
}
-
- @Override public Class valueType() { return Path.class; }
-
- @Override public String valuePattern() { return "path"; }
}
static class ExtractDirPathConverter implements ValueConverter {
@@ -1142,12 +1073,6 @@
if (Files.exists(path)) {
if (!Files.isDirectory(path))
throw new CommandException("err.cannot.create.dir", path);
- } else {
- try {
- Files.createDirectories(path);
- } catch (IOException ioe) {
- throw new CommandException("err.cannot.create.dir", path);
- }
}
return path;
} catch (InvalidPathException x) {
@@ -1316,22 +1241,19 @@
options = new Options();
parser.formatHelpWith(new JmodHelpFormatter(options));
- OptionSpec classPath
+ OptionSpec> classPath
= parser.accepts("class-path", getMessage("main.opt.class-path"))
.withRequiredArg()
- .withValuesSeparatedBy(File.pathSeparatorChar)
.withValuesConvertedBy(ClassPathConverter.INSTANCE);
- OptionSpec cmds
+ OptionSpec> cmds
= parser.accepts("cmds", getMessage("main.opt.cmds"))
.withRequiredArg()
- .withValuesSeparatedBy(File.pathSeparatorChar)
.withValuesConvertedBy(DirPathConverter.INSTANCE);
- OptionSpec config
+ OptionSpec> config
= parser.accepts("config", getMessage("main.opt.config"))
.withRequiredArg()
- .withValuesSeparatedBy(File.pathSeparatorChar)
.withValuesConvertedBy(DirPathConverter.INSTANCE);
OptionSpec dir
@@ -1359,22 +1281,19 @@
OptionSpec helpExtra
= parser.accepts("help-extra", getMessage("main.opt.help-extra"));
- OptionSpec headerFiles
+ OptionSpec> headerFiles
= parser.accepts("header-files", getMessage("main.opt.header-files"))
.withRequiredArg()
- .withValuesSeparatedBy(File.pathSeparatorChar)
.withValuesConvertedBy(DirPathConverter.INSTANCE);
- OptionSpec libs
+ OptionSpec> libs
= parser.accepts("libs", getMessage("main.opt.libs"))
.withRequiredArg()
- .withValuesSeparatedBy(File.pathSeparatorChar)
.withValuesConvertedBy(DirPathConverter.INSTANCE);
- OptionSpec legalNotices
+ OptionSpec> legalNotices
= parser.accepts("legal-notices", getMessage("main.opt.legal-notices"))
.withRequiredArg()
- .withValuesSeparatedBy(File.pathSeparatorChar)
.withValuesConvertedBy(DirPathConverter.INSTANCE);
@@ -1383,17 +1302,15 @@
.withRequiredArg()
.describedAs(getMessage("main.opt.main-class.arg"));
- OptionSpec manPages
+ OptionSpec> manPages
= parser.accepts("man-pages", getMessage("main.opt.man-pages"))
.withRequiredArg()
- .withValuesSeparatedBy(File.pathSeparatorChar)
.withValuesConvertedBy(DirPathConverter.INSTANCE);
- OptionSpec modulePath
+ OptionSpec> modulePath
= parser.acceptsAll(Set.of("p", "module-path"),
getMessage("main.opt.module-path"))
.withRequiredArg()
- .withValuesSeparatedBy(File.pathSeparatorChar)
.withValuesConvertedBy(DirPathConverter.INSTANCE);
OptionSpec moduleVersion
@@ -1452,48 +1369,48 @@
}
if (opts.has(classPath))
- options.classpath = opts.valuesOf(classPath);
+ options.classpath = getLastElement(opts.valuesOf(classPath));
if (opts.has(cmds))
- options.cmds = opts.valuesOf(cmds);
+ options.cmds = getLastElement(opts.valuesOf(cmds));
if (opts.has(config))
- options.configs = opts.valuesOf(config);
+ options.configs = getLastElement(opts.valuesOf(config));
if (opts.has(dir))
- options.extractDir = opts.valueOf(dir);
+ options.extractDir = getLastElement(opts.valuesOf(dir));
if (opts.has(dryrun))
options.dryrun = true;
if (opts.has(excludes))
- options.excludes = opts.valuesOf(excludes);
+ options.excludes = opts.valuesOf(excludes); // excludes is repeatable
if (opts.has(libs))
- options.libs = opts.valuesOf(libs);
+ options.libs = getLastElement(opts.valuesOf(libs));
if (opts.has(headerFiles))
- options.headerFiles = opts.valuesOf(headerFiles);
+ options.headerFiles = getLastElement(opts.valuesOf(headerFiles));
if (opts.has(manPages))
- options.manPages = opts.valuesOf(manPages);
+ options.manPages = getLastElement(opts.valuesOf(manPages));
if (opts.has(legalNotices))
- options.legalNotices = opts.valuesOf(legalNotices);
+ options.legalNotices = getLastElement(opts.valuesOf(legalNotices));
if (opts.has(modulePath)) {
- Path[] dirs = opts.valuesOf(modulePath).toArray(new Path[0]);
+ Path[] dirs = getLastElement(opts.valuesOf(modulePath)).toArray(new Path[0]);
options.moduleFinder = new ModulePath(Runtime.version(), true, dirs);
}
if (opts.has(moduleVersion))
- options.moduleVersion = opts.valueOf(moduleVersion);
+ options.moduleVersion = getLastElement(opts.valuesOf(moduleVersion));
if (opts.has(mainClass))
- options.mainClass = opts.valueOf(mainClass);
+ options.mainClass = getLastElement(opts.valuesOf(mainClass));
if (opts.has(osName))
- options.osName = opts.valueOf(osName);
+ options.osName = getLastElement(opts.valuesOf(osName));
if (opts.has(osArch))
- options.osArch = opts.valueOf(osArch);
+ options.osArch = getLastElement(opts.valuesOf(osArch));
if (opts.has(osVersion))
- options.osVersion = opts.valueOf(osVersion);
+ options.osVersion = getLastElement(opts.valuesOf(osVersion));
if (opts.has(warnIfResolved))
- options.moduleResolution = opts.valueOf(warnIfResolved);
+ options.moduleResolution = getLastElement(opts.valuesOf(warnIfResolved));
if (opts.has(doNotResolveByDefault)) {
if (options.moduleResolution == null)
options.moduleResolution = ModuleResolution.empty();
options.moduleResolution = options.moduleResolution.withDoNotResolveByDefault();
}
if (opts.has(hashModules)) {
- options.modulesToHash = opts.valueOf(hashModules);
+ options.modulesToHash = getLastElement(opts.valuesOf(hashModules));
// if storing hashes then the module path is required
if (options.moduleFinder == null)
throw new CommandException("err.modulepath.must.be.specified")
@@ -1531,6 +1448,13 @@
throw new CommandException("err.classpath.must.be.specified").showUsage(true);
if (options.mainClass != null && !isValidJavaIdentifier(options.mainClass))
throw new CommandException("err.invalid.main-class", options.mainClass);
+ if (options.mode.equals(Mode.EXTRACT) && options.extractDir != null) {
+ try {
+ Files.createDirectories(options.extractDir);
+ } catch (IOException ioe) {
+ throw new CommandException("err.cannot.create.dir", options.extractDir);
+ }
+ }
} catch (OptionException e) {
throw new CommandException(e.getMessage());
}
@@ -1558,6 +1482,12 @@
return true;
}
+ static E getLastElement(List list) {
+ if (list.size() == 0)
+ throw new InternalError("Unexpected 0 list size");
+ return list.get(list.size() - 1);
+ }
+
private void reportError(String message) {
out.println(getMessage("error.prefix") + " " + message);
}
diff -r be8643ebe865 -r 6665640c56cf jdk/src/jdk.jlink/share/classes/jdk/tools/jmod/resources/jmod.properties
--- a/jdk/src/jdk.jlink/share/classes/jdk/tools/jmod/resources/jmod.properties Fri Jan 13 01:36:02 2017 +0000
+++ b/jdk/src/jdk.jlink/share/classes/jdk/tools/jmod/resources/jmod.properties Wed Jul 05 22:41:30 2017 +0200
@@ -108,9 +108,9 @@
err.invalid.dryrun.option=--dry-run can only be used with hash mode
err.module.descriptor.not.found=Module descriptor not found
err.missing.export.or.open.packages=Packages that are exported or open in {0} are not present: {1}
+err.module.resolution.fail=Resolution failed: {0}
warn.invalid.arg=Invalid classname or pathname not exist: {0}
warn.no.module.hashes=No hashes recorded: no module specified for hashing depends on {0}
-warn.module.resolution.fail=No hashes recorded: {0}
warn.ignore.entry=ignoring entry {0}, in section {1}
warn.ignore.duplicate.entry=ignoring duplicate entry {0}, in section {1}
diff -r be8643ebe865 -r 6665640c56cf jdk/src/jdk.sctp/unix/native/libsctp/SctpChannelImpl.c
--- a/jdk/src/jdk.sctp/unix/native/libsctp/SctpChannelImpl.c Fri Jan 13 01:36:02 2017 +0000
+++ b/jdk/src/jdk.sctp/unix/native/libsctp/SctpChannelImpl.c Wed Jul 05 22:41:30 2017 +0200
@@ -418,7 +418,6 @@
(JNIEnv *env, jclass klass, jint fd, jobject resultContainerObj,
jlong address, jint length, jboolean peek) {
SOCKETADDRESS sa;
- int sa_len = sizeof(SOCKETADDRESS);
ssize_t rv = 0;
jlong *addr = jlong_to_ptr(address);
struct iovec iov[1];
@@ -429,7 +428,7 @@
/* Set up the msghdr structure for receiving */
memset(msg, 0, sizeof (*msg));
msg->msg_name = &sa;
- msg->msg_namelen = sa_len;
+ msg->msg_namelen = sizeof(sa);
iov->iov_base = addr;
iov->iov_len = length;
msg->msg_iov = iov;
@@ -538,7 +537,7 @@
jobject targetAddress, jint targetPort, jint assocId, jint streamNumber,
jboolean unordered, jint ppid) {
SOCKETADDRESS sa;
- int sa_len = sizeof(SOCKETADDRESS);
+ int sa_len = 0;
ssize_t rv = 0;
jlong *addr = jlong_to_ptr(address);
struct iovec iov[1];
@@ -555,13 +554,12 @@
* Association already existing, assocId != -1, targetAddress = preferred addr
*/
if (targetAddress != NULL /*&& assocId <= 0*/) {
- if (NET_InetAddressToSockaddr(env, targetAddress, targetPort, &sa.sa,
+ if (NET_InetAddressToSockaddr(env, targetAddress, targetPort, &sa,
&sa_len, JNI_TRUE) != 0) {
return IOS_THROWN;
}
} else {
- memset(&sa, '\x0', sa_len);
- sa_len = 0;
+ memset(&sa, '\x0', sizeof(sa));
}
/* Set up the msghdr structure for sending */
diff -r be8643ebe865 -r 6665640c56cf jdk/src/jdk.sctp/unix/native/libsctp/SctpNet.c
--- a/jdk/src/jdk.sctp/unix/native/libsctp/SctpNet.c Fri Jan 13 01:36:02 2017 +0000
+++ b/jdk/src/jdk.sctp/unix/native/libsctp/SctpNet.c Wed Jul 05 22:41:30 2017 +0200
@@ -211,22 +211,22 @@
(JNIEnv *env, jclass klass, jint fd, jobjectArray addrs, jint port,
jint addrsLength, jboolean add, jboolean preferIPv6) {
SOCKETADDRESS *sap, *tmpSap;
- int i, sa_len = sizeof(SOCKETADDRESS);
+ int i;
jobject ia;
if (addrsLength < 1)
return;
- if ((sap = calloc(addrsLength, sa_len)) == NULL) {
- JNU_ThrowOutOfMemoryError(env, "heap allocation failure");
+ if ((sap = calloc(addrsLength, sizeof(SOCKETADDRESS))) == NULL) {
+ JNU_ThrowOutOfMemoryError(env, "heap allocation failure");
return;
}
tmpSap = sap;
for (i = 0; i < addrsLength; i++) {
ia = (*env)->GetObjectArrayElement(env, addrs, i);
- if (NET_InetAddressToSockaddr(env, ia, port, (struct sockaddr*)tmpSap,
- &sa_len, preferIPv6) != 0) {
+ if (NET_InetAddressToSockaddr(env, ia, port, tmpSap, NULL,
+ preferIPv6) != 0) {
free(sap);
return;
}
@@ -262,11 +262,11 @@
Java_sun_nio_ch_sctp_SctpNet_connect0
(JNIEnv *env, jclass clazz, int fd, jobject iao, jint port) {
SOCKETADDRESS sa;
- int sa_len = sizeof(SOCKETADDRESS);
+ int sa_len = 0;
int rv;
- if (NET_InetAddressToSockaddr(env, iao, port, &sa.sa,
- &sa_len, JNI_TRUE) != 0) {
+ if (NET_InetAddressToSockaddr(env, iao, port, &sa, &sa_len,
+ JNI_TRUE) != 0) {
return IOS_THROWN;
}
@@ -311,8 +311,7 @@
}
}
-void initializeISA
- (JNIEnv* env) {
+void initializeISA(JNIEnv* env) {
if (isaCls == 0) {
jclass c = (*env)->FindClass(env, "java/net/InetSocketAddress");
CHECK_NULL(c);
@@ -325,8 +324,7 @@
}
}
-jobject SockAddrToInetSocketAddress
- (JNIEnv *env, struct sockaddr* sap) {
+jobject SockAddrToInetSocketAddress(JNIEnv *env, SOCKETADDRESS *sap) {
int port = 0;
jobject ia = NET_SockaddrToInetAddress(env, sap, &port);
@@ -347,9 +345,9 @@
* Signature: (I)[Ljava/net/SocketAddress;
*/
JNIEXPORT jobjectArray JNICALL Java_sun_nio_ch_sctp_SctpNet_getLocalAddresses0
- (JNIEnv *env, jclass klass, jint fd) {
+ (JNIEnv *env, jclass klass, jint fd)
+{
void *addr_buf, *laddr;
- struct sockaddr* sap;
int i, addrCount;
jobjectArray isaa;
@@ -377,38 +375,35 @@
}
laddr = addr_buf;
- for (i=0; iNewObject(env, isaCls, isaCtrID, ia, port);
if (isa == NULL)
break;
(*env)->SetObjectArrayElement(env, isaa, i, isa);
- if (sap->sa_family == AF_INET)
- addr_buf = ((struct sockaddr_in*)addr_buf) + 1;
+ if (((struct sockaddr *)addr_buf)->sa_family == AF_INET)
+ addr_buf = ((struct sockaddr_in *)addr_buf) + 1;
else
- addr_buf = ((struct sockaddr_in6*)addr_buf) + 1;
+ addr_buf = ((struct sockaddr_in6 *)addr_buf) + 1;
}
nio_sctp_freeladdrs(laddr);
return isaa;
}
-jobjectArray getRemoteAddresses
- (JNIEnv *env, jint fd, sctp_assoc_t id) {
+jobjectArray getRemoteAddresses(JNIEnv *env, jint fd, sctp_assoc_t id) {
void *addr_buf, *paddr;
- struct sockaddr* sap;
int i, addrCount;
jobjectArray isaa;
#if __solaris__
if ((addrCount = nio_sctp_getpaddrs(fd, id, (void **)&addr_buf)) == -1) {
#else /* __linux__ */
- if ((addrCount = nio_sctp_getpaddrs(fd, id, (struct sockaddr**)&addr_buf)) == -1) {
+ if ((addrCount = nio_sctp_getpaddrs(fd, id, (struct sockaddr **)&addr_buf)) == -1) {
#endif
handleSocketError(env, errno);
return NULL;
@@ -429,25 +424,23 @@
}
paddr = addr_buf;
- for (i=0; iNewObject(env, isaCls, isaCtrID, ia, port);
if (isa == NULL)
break;
(*env)->SetObjectArrayElement(env, isaa, i, isa);
- if (sap->sa_family == AF_INET)
- addr_buf = ((struct sockaddr_in*)addr_buf) + 1;
+ if (((struct sockaddr *)addr_buf)->sa_family == AF_INET)
+ addr_buf = ((struct sockaddr_in *)addr_buf) + 1;
else
- addr_buf = ((struct sockaddr_in6*)addr_buf) + 1;
+ addr_buf = ((struct sockaddr_in6 *)addr_buf) + 1;
}
nio_sctp_freepaddrs(paddr);
-
return isaa;
}
@@ -579,7 +572,6 @@
(JNIEnv *env, jclass klass, jint fd, jint assocId) {
struct sctp_setprim prim;
unsigned int prim_len = sizeof(prim);
- struct sockaddr* sap = (struct sockaddr*)&prim.ssp_addr;
prim.ssp_assoc_id = assocId;
@@ -589,7 +581,7 @@
return NULL;
}
- return SockAddrToInetSocketAddress(env, sap);
+ return SockAddrToInetSocketAddress(env, (SOCKETADDRESS *)&prim.ssp_addr);
}
/*
@@ -600,11 +592,10 @@
JNIEXPORT void JNICALL Java_sun_nio_ch_sctp_SctpNet_setPrimAddrOption0
(JNIEnv *env, jclass klass, jint fd, jint assocId, jobject iaObj, jint port) {
struct sctp_setprim prim;
- struct sockaddr* sap = (struct sockaddr*)&prim.ssp_addr;
- int sap_len = sizeof(sap);
- if (NET_InetAddressToSockaddr(env, iaObj, port, sap,
- &sap_len, JNI_TRUE) != 0) {
+ if (NET_InetAddressToSockaddr(env, iaObj, port,
+ (SOCKETADDRESS *)&prim.ssp_addr,
+ NULL, JNI_TRUE) != 0) {
return;
}
@@ -625,18 +616,17 @@
(JNIEnv *env, jclass klass, jint fd, jint assocId,
jobject iaObj, jint port, jboolean preferIPv6) {
struct sctp_setpeerprim prim;
- struct sockaddr* sap = (struct sockaddr*)&prim.sspp_addr;
- int sap_len = sizeof(sap);
- if (NET_InetAddressToSockaddr(env, iaObj, port, sap,
- &sap_len, preferIPv6) != 0) {
+ if (NET_InetAddressToSockaddr(env, iaObj, port,
+ (SOCKETADDRESS *)&prim.sspp_addr,
+ NULL, preferIPv6) != 0) {
return;
}
prim.sspp_assoc_id = assocId;
if (setsockopt(fd, IPPROTO_SCTP, SCTP_SET_PEER_PRIMARY_ADDR, &prim,
- sizeof(prim)) < 0) {
+ sizeof(prim)) < 0) {
JNU_ThrowByNameWithLastError(env, JNU_JAVANETPKG "SocketException",
"sun.nio.ch.SctpNet.setPeerPrimAddrOption0");
}
diff -r be8643ebe865 -r 6665640c56cf jdk/test/ProblemList.txt
--- a/jdk/test/ProblemList.txt Fri Jan 13 01:36:02 2017 +0000
+++ b/jdk/test/ProblemList.txt Wed Jul 05 22:41:30 2017 +0200
@@ -1,6 +1,6 @@
###########################################################################
#
-# Copyright (c) 2009, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 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
@@ -141,8 +141,6 @@
# jdk_io
-java/io/pathNames/GeneralWin32.java 8156595 windows-all
-
############################################################################
# jdk_management
@@ -203,8 +201,6 @@
sun/rmi/rmic/newrmic/equivalence/run.sh 8145980 generic-all
-java/rmi/registry/readTest/readTest.sh 7146543 generic-all
-
############################################################################
# jdk_security
@@ -262,6 +258,8 @@
tools/jlink/multireleasejar/JLinkMultiReleaseJarTest.java 8169971 windows-x64
+tools/jmod/JmodTest.java 8172870 windows-all
+
############################################################################
# jdk_jdi
diff -r be8643ebe865 -r 6665640c56cf jdk/test/java/awt/Frame/NormalToIconified/NormalToIconifiedTest.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/awt/Frame/NormalToIconified/NormalToIconifiedTest.java Wed Jul 05 22:41:30 2017 +0200
@@ -0,0 +1,105 @@
+/*
+ * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * 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.
+ */
+
+/*
+ * @test
+ * @bug 8171949
+ * @summary Tests that bitwise mask is set and state listener is notified during state transition.
+ * @author Dmitry Markov
+ * @library ../../regtesthelpers
+ * @build Util
+ * @run main NormalToIconifiedTest
+ */
+
+import java.awt.Frame;
+import java.awt.Robot;
+import java.awt.event.WindowEvent;
+import java.awt.event.WindowStateListener;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import test.java.awt.regtesthelpers.Util;
+
+public class NormalToIconifiedTest {
+ private static final AtomicBoolean listenerNotified = new AtomicBoolean(false);
+
+ public static void main(String[] args) {
+ Robot robot = Util.createRobot();
+
+ Frame testFrame = new Frame("Test Frame");
+ testFrame.setSize(200, 200);
+ testFrame.addWindowStateListener(new WindowStateListener() {
+ @Override
+ public void windowStateChanged(WindowEvent e) {
+ listenerNotified.set(true);
+ synchronized (listenerNotified) {
+ listenerNotified.notifyAll();
+ }
+ }
+ });
+ testFrame.setVisible(true);
+
+ Frame mainFrame = new Frame("Main Frame");
+ mainFrame.setSize(200, 200);
+ mainFrame.setLocationRelativeTo(null);
+ mainFrame.setVisible(true);
+
+ Util.waitForIdle(robot);
+
+ try {
+ Util.clickOnComp(mainFrame, robot);
+ Util.waitForIdle(robot);
+
+ // NORMAL -> ICONIFIED
+ listenerNotified.set(false);
+ testFrame.setExtendedState(Frame.ICONIFIED);
+ Util.waitForIdle(robot);
+
+ Util.waitForCondition(listenerNotified, 2000);
+ if (!listenerNotified.get()) {
+ throw new RuntimeException("Test FAILED! Window state listener was not notified during NORMAL to" +
+ "ICONIFIED transition");
+ }
+ if (testFrame.getExtendedState() != Frame.ICONIFIED) {
+ throw new RuntimeException("Test FAILED! Frame is not in ICONIFIED state");
+ }
+
+ // ICONIFIED -> NORMAL
+ listenerNotified.set(false);
+ testFrame.setExtendedState(Frame.NORMAL);
+ Util.waitForIdle(robot);
+
+ Util.waitForCondition(listenerNotified, 2000);
+ if (!listenerNotified.get()) {
+ throw new RuntimeException("Test FAILED! Window state listener was not notified during ICONIFIED to" +
+ "NORMAL transition");
+ }
+ if (testFrame.getExtendedState() != Frame.NORMAL) {
+ throw new RuntimeException("Test FAILED! Frame is not in NORMAL state");
+ }
+ } finally {
+ testFrame.dispose();
+ mainFrame.dispose();
+ }
+ }
+}
+
diff -r be8643ebe865 -r 6665640c56cf jdk/test/java/awt/Frame/ObscuredFrame/ObscuredFrameTest.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/awt/Frame/ObscuredFrame/ObscuredFrameTest.java Wed Jul 05 22:41:30 2017 +0200
@@ -0,0 +1,70 @@
+/*
+ * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * 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.
+ */
+
+/*
+ * @test
+ * @bug 8171952
+ * @summary Tests that getMousePosition() returns null for obscured component.
+ * @author Dmitry Markov
+ * @library ../../regtesthelpers
+ * @build Util
+ * @run main ObscuredFrameTest
+ */
+
+import java.awt.*;
+
+import test.java.awt.regtesthelpers.Util;
+
+public class ObscuredFrameTest {
+ public static void main(String[] args) {
+ Robot robot = Util.createRobot();
+
+ Frame frame = new Frame("Obscured Frame");
+ frame.setSize(200, 200);
+ frame.setLocationRelativeTo(null);
+ Button button = new Button("Button");
+ frame.add(button);
+
+ Dialog dialog = new Dialog(frame, "Visible Dialog", false);
+ dialog.setSize(200, 200);
+ dialog.setLocationRelativeTo(null);
+ dialog.setVisible(true);
+
+ frame.setVisible(true);
+
+ Util.waitForIdle(robot);
+
+ Util.pointOnComp(button, robot);
+ Util.waitForIdle(robot);
+
+ try {
+ if (button.getMousePosition() != null) {
+ throw new RuntimeException("Test Failed! Mouse position is not null for obscured component.");
+ }
+ } finally {
+ frame.dispose();
+ dialog.dispose();
+ }
+ }
+}
+
diff -r be8643ebe865 -r 6665640c56cf jdk/test/java/awt/Window/ChangeWindowResizabilty/ChangeWindowResizabiltyTest.java
--- a/jdk/test/java/awt/Window/ChangeWindowResizabilty/ChangeWindowResizabiltyTest.java Fri Jan 13 01:36:02 2017 +0000
+++ b/jdk/test/java/awt/Window/ChangeWindowResizabilty/ChangeWindowResizabiltyTest.java Wed Jul 05 22:41:30 2017 +0200
@@ -23,7 +23,7 @@
/* @test
@key headful
- @bug 8166897
+ @bug 8166897 8167652
@summary Some font overlap in the Optionpane dialog.
@run main ChangeWindowResizabiltyTest
*/
@@ -34,41 +34,75 @@
import java.awt.Frame;
import java.awt.Panel;
import java.awt.Robot;
+import java.awt.Point;
public class ChangeWindowResizabiltyTest {
public static void main(String[] args) throws Exception {
Robot robot = new Robot();
for(int i = 0; i < 10; i++) {
Dialog dialog = new Dialog((Frame) null);
+ dialog.setLocation(100, 100);
Component panel = new Panel();
panel.setPreferredSize(new Dimension(200, 100));
dialog.add(panel);
dialog.pack();
dialog.setVisible(true);
+ robot.waitForIdle();
+ robot.delay(200);
+
+ Point frameLoc = dialog.getLocationOnScreen();
+ Point contentLoc = panel.getLocationOnScreen();
+
+ System.out.println("Decor location " + frameLoc);
+ System.out.println("Content location " + contentLoc);
dialog.setResizable(false);
robot.waitForIdle();
robot.delay(200);
- System.out.println(panel.getLocationOnScreen());
- System.out.println(dialog.getLocationOnScreen());
+ Point l = dialog.getLocationOnScreen();
+ if (!l.equals(frameLoc)) {
+ dialog.dispose();
+ throw new RuntimeException("Decorated frame location moved " +
+ "after setResizable(false)" + l);
+ }
+
+ l = panel.getLocationOnScreen();
+ if (!l.equals(contentLoc)) {
+ dialog.dispose();
+ throw new RuntimeException("Content location moved after " +
+ "setResizable(false)" + l);
+ }
+
if (panel.getLocationOnScreen().y <
- dialog.getLocationOnScreen().y + dialog.getInsets().top) {
+ dialog.getLocationOnScreen().y + dialog.getInsets().top) {
dialog.dispose();
throw new RuntimeException(
- "Wrong content position after setResizable(false)");
+ "Wrong content position after setResizable(false)");
}
dialog.setResizable(true);
robot.waitForIdle();
robot.delay(200);
- System.out.println(panel.getLocationOnScreen());
- System.out.println(dialog.getLocationOnScreen());
+
+ l = dialog.getLocationOnScreen();
+ if (!l.equals(frameLoc)) {
+ dialog.dispose();
+ throw new RuntimeException("Decorated frame location moved " +
+ "after setResizable(true)" + l);
+ }
+
+ l = panel.getLocationOnScreen();
+ if (!l.equals(contentLoc)) {
+ dialog.dispose();
+ throw new RuntimeException("Content location moved after " +
+ "setResizable(true)" + l);
+ }
if (panel.getLocationOnScreen().y <
- dialog.getLocationOnScreen().y + dialog.getInsets().top) {
+ dialog.getLocationOnScreen().y + dialog.getInsets().top) {
dialog.dispose();
throw new RuntimeException(
- "Wrong content position after setResizable(true)");
+ "Wrong content position after setResizable(true)");
}
dialog.dispose();
diff -r be8643ebe865 -r 6665640c56cf jdk/test/java/awt/datatransfer/DragImage/MultiResolutionDragImageTest.java
--- a/jdk/test/java/awt/datatransfer/DragImage/MultiResolutionDragImageTest.java Fri Jan 13 01:36:02 2017 +0000
+++ b/jdk/test/java/awt/datatransfer/DragImage/MultiResolutionDragImageTest.java Wed Jul 05 22:41:30 2017 +0200
@@ -22,7 +22,6 @@
*/
import sun.awt.image.MultiResolutionToolkitImage;
-import sun.java2d.SunGraphics2D;
import javax.swing.*;
import java.awt.*;
@@ -37,7 +36,6 @@
* @summary [macosx] Drag image of TransferHandler does not honor
* MultiResolutionImage
* @modules java.desktop/sun.awt.image
- * java.desktop/sun.java2d
* @run main MultiResolutionDragImageTest TEST_DRAG
*/
public class MultiResolutionDragImageTest {
@@ -126,30 +124,11 @@
return Math.abs(n - m) <= 50;
}
- private static float getScaleFactor() {
-
- final Dialog dialog = new Dialog((Window) null);
- dialog.setSize(100, 100);
- dialog.setModal(true);
- final float[] scaleFactors = new float[1];
- Panel panel = new Panel() {
-
- @Override
- public void paint(Graphics g) {
- float scaleFactor = 1;
- if (g instanceof SunGraphics2D) {
- scaleFactor = ((SunGraphics2D) g).surfaceData.getDefaultScale();
- }
- scaleFactors[0] = scaleFactor;
- dialog.setVisible(false);
- }
- };
-
- dialog.add(panel);
- dialog.setVisible(true);
- dialog.dispose();
-
- return scaleFactors[0];
+ static float getScaleFactor() {
+ return (float) GraphicsEnvironment.
+ getLocalGraphicsEnvironment().
+ getDefaultScreenDevice().getDefaultConfiguration().
+ getDefaultTransform().getScaleX();
}
private static Image createMultiResolutionImage() {
diff -r be8643ebe865 -r 6665640c56cf jdk/test/java/awt/font/GlyphVector/TestLayoutFlags.java
--- a/jdk/test/java/awt/font/GlyphVector/TestLayoutFlags.java Fri Jan 13 01:36:02 2017 +0000
+++ b/jdk/test/java/awt/font/GlyphVector/TestLayoutFlags.java Wed Jul 05 22:41:30 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
/* @test
- @bug 4328745 5090704
+ @bug 4328745 5090704 8166111
@summary exercise getLayoutFlags, getGlyphCharIndex, getGlyphCharIndices
*/
@@ -82,7 +82,7 @@
test("latin", latinGV, GlyphVector.FLAG_HAS_POSITION_ADJUSTMENTS);
test("hebrew", hebrewGV, GlyphVector.FLAG_RUN_RTL |
GlyphVector.FLAG_HAS_POSITION_ADJUSTMENTS);
- test("arabic", arabicGV, GlyphVector.FLAG_RUN_RTL |
+ test("arabic", arabicGV, GlyphVector.FLAG_COMPLEX_GLYPHS |
GlyphVector.FLAG_HAS_POSITION_ADJUSTMENTS);
test("hindi", hindiGV, GlyphVector.FLAG_COMPLEX_GLYPHS |
GlyphVector.FLAG_HAS_POSITION_ADJUSTMENTS);
diff -r be8643ebe865 -r 6665640c56cf jdk/test/java/awt/image/Raster/TestChildRasterOp.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/awt/image/Raster/TestChildRasterOp.java Wed Jul 05 22:41:30 2017 +0200
@@ -0,0 +1,99 @@
+/*
+ * Copyright (c) 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.
+ *
+ * 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.
+ */
+
+/**
+ * @test
+ * @bug 8130737 8172559
+ * @summary test no exception rasterop for child raster with non-zero offset
+ */
+
+import java.awt.geom.AffineTransform;
+import java.awt.image.AffineTransformOp;
+import java.awt.image.DataBuffer;
+import java.awt.image.DataBufferByte;
+import java.awt.image.DataBufferInt;
+import java.awt.image.DataBufferUShort;
+import java.awt.image.Raster;
+import java.awt.image.WritableRaster;
+
+public class TestChildRasterOp {
+
+ private static AffineTransform at = new AffineTransform();
+ private static final AffineTransformOp rop =
+ new AffineTransformOp(at, AffineTransformOp.TYPE_NEAREST_NEIGHBOR);
+ private static int[] offsets = {0};
+
+ public static void main(String[] args) {
+ testByteRaster();
+ testShortRaster();
+ testIntRaster();
+ }
+
+ private static void testByteRaster() {
+ WritableRaster srcRaster, dstRaster;
+
+ byte[] pixels =
+ { 11, 12, 13, 14,
+ 21, 22, 23, 24,
+ 31, 32, 33, 34,
+ 41, 42, 43, 44 };
+
+ DataBuffer db = new DataBufferByte(pixels, pixels.length);
+ srcRaster =
+ Raster.createInterleavedRaster(db, 4, 4, 4, 1, offsets, null);
+ srcRaster = srcRaster.createWritableChild(1, 1, 3, 3, 0, 0, null);
+ dstRaster = rop.filter(srcRaster, null);
+ }
+
+ private static void testShortRaster() {
+ WritableRaster srcRaster, dstRaster;
+
+ short[] pixels =
+ { 11, 12, 13, 14,
+ 21, 22, 23, 24,
+ 31, 32, 33, 34,
+ 41, 42, 43, 44 };
+
+ DataBuffer db = new DataBufferUShort(pixels, pixels.length);
+ srcRaster =
+ Raster.createInterleavedRaster(db, 4, 4, 4, 1, offsets, null);
+ srcRaster = srcRaster.createWritableChild(1, 1, 3, 3, 0, 0, null);
+ dstRaster = rop.filter(srcRaster, null);
+ }
+
+ private static void testIntRaster() {
+ WritableRaster srcRaster, dstRaster;
+
+ int[] pixels =
+ { 11, 12, 13, 14,
+ 21, 22, 23, 24,
+ 31, 32, 33, 34,
+ 41, 42, 43, 44 };
+
+ DataBuffer db = new DataBufferInt(pixels, pixels.length);
+ srcRaster =
+ Raster.createPackedRaster(db, 4, 4, 4, offsets, null);
+ srcRaster = srcRaster.createWritableChild(1, 1, 3, 3, 0, 0, null);
+ dstRaster = rop.filter(srcRaster, null);
+ }
+}
diff -r be8643ebe865 -r 6665640c56cf jdk/test/java/awt/print/PaintSetEnabledDeadlock/PaintSetEnabledDeadlock.java
--- a/jdk/test/java/awt/print/PaintSetEnabledDeadlock/PaintSetEnabledDeadlock.java Fri Jan 13 01:36:02 2017 +0000
+++ b/jdk/test/java/awt/print/PaintSetEnabledDeadlock/PaintSetEnabledDeadlock.java Wed Jul 05 22:41:30 2017 +0200
@@ -24,16 +24,28 @@
/*
* @test
* @key headful
- * @bug 7108598
+ * @bug 7108598 8172009
* @summary Container.paint/KeyboardFocusManager.clearMostRecentFocusOwner methods deadlock
* @library ../../regtesthelpers
* @author Oleg Pekhovskiy
* @build Util
- * @run main/timeout=20 PaintSetEnabledDeadlock
+ * @run main PaintSetEnabledDeadlock
*/
-import java.awt.*;
-import java.awt.event.*;
+import java.awt.Button;
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.Frame;
+import java.awt.Graphics;
+import java.awt.GridLayout;
+import java.awt.Image;
+import java.awt.Panel;
+import java.awt.Rectangle;
+import java.awt.Robot;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
import test.java.awt.regtesthelpers.Util;
public class PaintSetEnabledDeadlock extends Frame {
diff -r be8643ebe865 -r 6665640c56cf jdk/test/java/awt/print/PrinterJob/BannerTest.java
--- a/jdk/test/java/awt/print/PrinterJob/BannerTest.java Fri Jan 13 01:36:02 2017 +0000
+++ b/jdk/test/java/awt/print/PrinterJob/BannerTest.java Wed Jul 05 22:41:30 2017 +0200
@@ -22,7 +22,7 @@
*/
/*
* @test
- * @bug 6575247
+ * @bug 6575247 8170579
* @summary Verifies if Banner page is printed
* @requires (os.family == "linux" | os.family == "solaris")
* @run main/manual BannerTest
@@ -39,6 +39,9 @@
import static java.awt.print.Printable.PAGE_EXISTS;
import java.awt.print.PrinterException;
import java.awt.print.PrinterJob;
+import javax.print.PrintService;
+import javax.print.attribute.standard.JobSheets;
+import javax.print.attribute.standard.SheetCollate;
import javax.swing.JButton;
import javax.swing.JDialog;
import javax.swing.JPanel;
@@ -50,8 +53,18 @@
private static Thread mainThread;
private static boolean testPassed;
private static boolean testGeneratedInterrupt;
+ private static volatile PrinterJob job;
public static void main(String[] args) throws Exception {
+ job = PrinterJob.getPrinterJob();
+ PrintService prtSrv = job.getPrintService();
+ if (job.getPrintService() == null) {
+ System.out.println("No printers. Test cannot continue");
+ return;
+ }
+ if (!prtSrv.isAttributeCategorySupported(JobSheets.class)) {
+ return;
+ }
SwingUtilities.invokeAndWait(() -> {
doTest(BannerTest::printTest);
});
@@ -69,11 +82,6 @@
}
private static void printTest() {
- PrinterJob job = PrinterJob.getPrinterJob();
- if (job.getPrintService() == null) {
- System.out.println("No printers. Test cannot continue");
- return;
- }
job.setPrintable(new BannerTest());
if(job.printDialog()) {
try {
diff -r be8643ebe865 -r 6665640c56cf jdk/test/java/awt/print/PrinterJob/TestCheckSystemDefaultBannerOption.java
--- a/jdk/test/java/awt/print/PrinterJob/TestCheckSystemDefaultBannerOption.java Fri Jan 13 01:36:02 2017 +0000
+++ b/jdk/test/java/awt/print/PrinterJob/TestCheckSystemDefaultBannerOption.java Wed Jul 05 22:41:30 2017 +0200
@@ -22,7 +22,7 @@
*/
/*
* @test
- * @bug 8165947
+ * @bug 8165947 8170579
* @summary Verifies System default banner page option is honoured by jdk
* @requires (os.family == "linux" | os.family == "solaris")
* @run main/manual TestCheckSystemDefaultBannerOption
@@ -38,6 +38,7 @@
import static java.awt.print.Printable.PAGE_EXISTS;
import java.awt.print.PrinterException;
import java.awt.print.PrinterJob;
+import javax.print.PrintService;
import javax.print.attribute.standard.JobSheets;
import javax.swing.JButton;
import javax.swing.JDialog;
@@ -56,10 +57,15 @@
public static void main (String[] args) throws Exception {
job = PrinterJob.getPrinterJob();
- if (job.getPrintService() == null) {
+ PrintService prtSrv = job.getPrintService();
+ if (prtSrv == null) {
System.out.println("No printers. Test cannot continue");
return;
}
+ // do not run the test if JobSheet category is not supported
+ if (!prtSrv.isAttributeCategorySupported(JobSheets.class)) {
+ return;
+ }
// check system default banner option and let user know what to expect
JobSheets js = (JobSheets)job.getPrintService().
getDefaultAttributeValue(JobSheets.class);
diff -r be8643ebe865 -r 6665640c56cf jdk/test/java/io/File/WinDirRelative.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/io/File/WinDirRelative.java Wed Jul 05 22:41:30 2017 +0200
@@ -0,0 +1,96 @@
+/*
+ * Copyright (c) 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.
+ *
+ * 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.
+ */
+
+/*
+ * @test
+ * @bug 8153250
+ * @summary Tests that files are correctly listed for a directory-relative path
+ * @requires (os.family == "windows")
+ */
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+
+public class WinDirRelative {
+ private static final char COLON = ':';
+ private static final String BASENAME = "TestFile_";
+ private static final String EXTENSION = ".txt";
+ private static final int NUM_FILES = 10;
+
+ private static boolean isLetter(char c) {
+ return ((c >= 'a') && (c <= 'z')) || ((c >= 'A') && (c <= 'Z'));
+ }
+
+ public static void main(String[] args) throws Throwable {
+ // Get the working directory which is also the default
+ // directory for the current drive.
+ String userDir = System.getProperty("user.dir");
+
+ // Test only if a leading drive letter is found
+ if (isLetter(userDir.charAt(0)) && userDir.charAt(1) == COLON) {
+ // Create some empty files
+ List filenames = new ArrayList(NUM_FILES);
+ for (int i = 0; i < NUM_FILES; i++) {
+ String filename = BASENAME + i + EXTENSION;
+ filenames.add(filename);
+ File f = new File(filename);
+ f.createNewFile();
+ f.deleteOnExit();
+ System.out.printf("Created %s (%s)%n", filename,
+ f.getAbsolutePath());
+ }
+
+ // List files and verify that the ones with recognized names exist.
+ String prefix = userDir.substring(0, 2);
+ File p = new File(prefix);
+ int failures = 0;
+ int successes = 0;
+ for (File f : p.listFiles()) {
+ if (f.getName().toString().startsWith(BASENAME)) {
+ if (!f.exists()) {
+ System.err.printf("%s (%s) does not exist%n", f,
+ f.getAbsolutePath());
+ failures++;
+ } else {
+ successes++;
+ }
+ }
+ }
+
+ // Fail if there was an existence test failure or if not
+ // enough of the created files were found
+ boolean testFailed = false;
+ if (failures > 0) {
+ System.err.println("Existence check failed");
+ testFailed = true;
+ }
+ if (successes != NUM_FILES) {
+ System.err.println("Count check failed");
+ testFailed = true;
+ }
+ if (testFailed) {
+ throw new RuntimeException("Test failed");
+ }
+ }
+ }
+}
diff -r be8643ebe865 -r 6665640c56cf jdk/test/java/io/File/createTempFile/Patterns.java
--- a/jdk/test/java/io/File/createTempFile/Patterns.java Fri Jan 13 01:36:02 2017 +0000
+++ b/jdk/test/java/io/File/createTempFile/Patterns.java Wed Jul 05 22:41:30 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, Oracle and/or its affiliates. All rights reserved.
+ * 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
@@ -22,7 +22,7 @@
*/
/* @test
- @bug 4152178
+ @bug 4152178 8152272
@summary Check various temp-file prefix/suffix cases */
import java.io.File;
@@ -66,6 +66,7 @@
cky("xxx", "");
cky("xxx", "y");
cky("xxx", ".y");
+ cky("xyz", "Directory" + System.getProperty("file.separator"));
}
}
diff -r be8643ebe865 -r 6665640c56cf jdk/test/java/io/pathNames/General.java
--- a/jdk/test/java/io/pathNames/General.java Fri Jan 13 01:36:02 2017 +0000
+++ b/jdk/test/java/io/pathNames/General.java Wed Jul 05 22:41:30 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved.
+ * 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
@@ -40,6 +40,7 @@
private static int gensymCounter = 0;
protected static final String userDir = System.getProperty("user.dir");
+ protected static final String workSubDir = "tmp";
protected static String baseDir = null;
protected static String relative = null;
@@ -60,7 +61,10 @@
* direct or indirect calling) in a whole test.
*/
protected static void initTestData(int depth) throws IOException {
- File parent = new File(userDir);
+ File parent = new File(userDir + File.separator + workSubDir);
+ if (!parent.mkdir()) {
+ throw new IOException("Fail to create directory: " + parent);
+ }
for (int i = 0; i < depth; i++) {
File tmp = new File(parent, gensym());
tmp.createNewFile();
diff -r be8643ebe865 -r 6665640c56cf jdk/test/java/io/pathNames/GeneralWin32.java
--- a/jdk/test/java/io/pathNames/GeneralWin32.java Fri Jan 13 01:36:02 2017 +0000
+++ b/jdk/test/java/io/pathNames/GeneralWin32.java Wed Jul 05 22:41:30 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved.
+ * 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
@@ -53,7 +53,8 @@
private static void checkCaseLookup() throws IOException {
/* Use long names here to avoid 8.3 format, which Samba servers often
force to lowercase */
- File d = new File("XyZzY0123", "FOO_bar_BAZ");
+ File r = new File (workSubDir, "XyZzY0123");
+ File d = new File(r, "FOO_bar_BAZ");
File f = new File(d, "GLORPified");
if (!f.exists()) {
if (!d.exists()) {
@@ -74,9 +75,9 @@
case of filenames, rather than just using the input case */
File y = new File(userDir, f.getPath());
String ans = y.getPath();
- check(ans, "XyZzY0123\\FOO_bar_BAZ\\GLORPified");
- check(ans, "xyzzy0123\\foo_bar_baz\\glorpified");
- check(ans, "XYZZY0123\\FOO_BAR_BAZ\\GLORPIFIED");
+ check(ans, workSubDir + File.separator + "XyZzY0123\\FOO_bar_BAZ\\GLORPified");
+ check(ans, workSubDir + File.separator + "xyzzy0123\\foo_bar_baz\\glorpified");
+ check(ans, workSubDir + File.separator + "XYZZY0123\\FOO_BAR_BAZ\\GLORPIFIED");
}
private static void checkWild(File f) throws Exception {
@@ -125,20 +126,19 @@
throw new RuntimeException("Can't find an active drive");
}
- private static void checkDrive(int depth, char drive, boolean exists)
+ private static void checkDrive(int depth, String drive, boolean exists)
throws Exception
{
- String d = drive + ":";
- File df = new File(d);
- String ans = exists ? df.getAbsolutePath() : d;
+ File df = new File(drive);
+ String ans = exists ? df.getAbsolutePath() : drive;
if (!ans.endsWith("\\"))
ans = ans + "\\";
- checkNames(depth, false, ans, d);
+ checkNames(depth, false, ans, drive);
}
private static void checkDrivePaths(int depth) throws Exception {
- checkDrive(depth, findActiveDrive(), true);
- checkDrive(depth, findInactiveDrive(), false);
+ checkDrive(depth, findActiveDrive() + ":" + workSubDir + File.separator, true);
+ checkDrive(depth, findInactiveDrive() + ":", false);
}
diff -r be8643ebe865 -r 6665640c56cf jdk/test/java/net/URLConnection/SetDefaultUseCaches.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/net/URLConnection/SetDefaultUseCaches.java Wed Jul 05 22:41:30 2017 +0200
@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * 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.
+ */
+
+/* @test
+ * @bug 8163449
+ * @summary Allow per protocol setting for URLConnection defaultUseCaches
+ * @run main/othervm SetDefaultUseCaches
+ */
+
+import java.net.*;
+import java.io.*;
+
+public class SetDefaultUseCaches {
+ static void testAssert(boolean value, boolean comparator) {
+ if (value != comparator) {
+ System.err.println("Expected " + comparator + " Got " + value);
+ throw new RuntimeException("Test failed:");
+ } else
+ System.err.println("OK");
+ }
+
+ public static void main(String s[]) throws Exception {
+ URL url = new URL("http://www.foo.com/");
+ URL url1 = new URL("file:///a/b.txt");
+
+ // check default default is true
+ URLConnection urlc = url.openConnection();
+ testAssert(urlc.getDefaultUseCaches(), true);
+
+ // set default for http to false and check
+ URLConnection.setDefaultUseCaches("HTTP", false);
+
+ urlc = url.openConnection();
+ testAssert(urlc.getDefaultUseCaches(), true);
+ testAssert(urlc.getUseCaches(), false);
+ testAssert(URLConnection.getDefaultUseCaches("http"), false);
+
+ URLConnection urlc1 = url1.openConnection();
+ testAssert(urlc1.getDefaultUseCaches(), true);
+
+ // set default default to false and check other values the same
+ urlc.setDefaultUseCaches(false);
+ urlc1.setDefaultUseCaches("fiLe", true);
+ testAssert(urlc1.getDefaultUseCaches(), false);
+ testAssert(URLConnection.getDefaultUseCaches("fiLE"), true);
+ }
+}
diff -r be8643ebe865 -r 6665640c56cf jdk/test/java/rmi/registry/altSecurityManager/AltSecurityManager.java
--- a/jdk/test/java/rmi/registry/altSecurityManager/AltSecurityManager.java Fri Jan 13 01:36:02 2017 +0000
+++ b/jdk/test/java/rmi/registry/altSecurityManager/AltSecurityManager.java Wed Jul 05 22:41:30 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 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
@@ -31,7 +31,9 @@
* java.rmi/sun.rmi.server
* java.rmi/sun.rmi.transport
* java.rmi/sun.rmi.transport.tcp
- * @build TestLibrary JavaVM RMID TestSecurityManager
+ * java.base/sun.nio.ch
+ * @build TestLibrary RMID RMIDSelectorProvider RegistryVM RMIRegistryRunner
+ * TestSecurityManager
* @run main/othervm AltSecurityManager
*/
@@ -44,7 +46,6 @@
* if registry and rmid take too long to exit.
*/
public class AltSecurityManager implements Runnable {
- private final int regPort;
// variable to hold registry and rmid children
static JavaVM vm = null;
@@ -57,31 +58,34 @@
private static final long TIME_OUT =
(long)(15000 * TestLibrary.getTimeoutFactor());
- public AltSecurityManager(int port) {
- if (port <= 0) {
- TestLibrary.bomb("Port must be greater than 0.");
- }
-
- this.regPort = port;
- }
-
public void run() {
try {
if (utilityToStart.equals(REGISTRY_IMPL)) {
- vm = new JavaVM(utilityToStart,
- " -Djava.security.manager=TestSecurityManager",
- Integer.toString(regPort));
+ vm = RegistryVM.createRegistryVMWithRunner(
+ "RMIRegistryRunner",
+ "-Djava.security.manager=TestSecurityManager");
} else if (utilityToStart.contains(ACTIVATION)) {
- vm = new JavaVM(utilityToStart,
- " -Djava.security.manager=TestSecurityManager",
- "-port " + Integer.toString(regPort));
+ vm = RMID.createRMIDOnEphemeralPortWithOptions(
+ "-Djava.security.manager=TestSecurityManager");
} else {
TestLibrary.bomb("Utility to start must be " + REGISTRY_IMPL +
" or " + ACTIVATION);
}
System.err.println("starting " + utilityToStart);
- vm.execute();
+ try {
+ vm.start();
+ throw new RuntimeException("Expected exception did not occur!");
+ } catch (Exception expected) {
+ int exit = vm.waitFor();
+ if (exit != TestSecurityManager.EXIT_VALUE) {
+ throw new RuntimeException(utilityToStart
+ + " exit with an unexpected value "
+ + exit + ".");
+ }
+ System.err.format("Success: starting %s exited with status %d%n",
+ utilityToStart, TestSecurityManager.EXIT_VALUE);
+ }
} catch (Exception e) {
TestLibrary.bomb(e);
@@ -96,8 +100,7 @@
utilityToStart = utility;
try {
- int port = TestLibrary.getUnusedRandomPort();
- Thread thread = new Thread(new AltSecurityManager(port));
+ Thread thread = new Thread(new AltSecurityManager());
System.err.println("expecting RuntimeException for " +
"checkListen in child process");
long start = System.currentTimeMillis();
@@ -116,7 +119,7 @@
" terminated on time");
}
} finally {
- vm.destroy();
+ vm.cleanup();
vm = null;
}
}
diff -r be8643ebe865 -r 6665640c56cf jdk/test/java/rmi/registry/altSecurityManager/TestSecurityManager.java
--- a/jdk/test/java/rmi/registry/altSecurityManager/TestSecurityManager.java Fri Jan 13 01:36:02 2017 +0000
+++ b/jdk/test/java/rmi/registry/altSecurityManager/TestSecurityManager.java Wed Jul 05 22:41:30 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 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
@@ -24,6 +24,8 @@
/**/
public class TestSecurityManager extends SecurityManager {
+ public static final int EXIT_VALUE = 123;
+
public TestSecurityManager() {
}
@@ -36,7 +38,7 @@
// by the main test process to detect that the proper security
// manager has been installed in the relevant VMs.
//
- System.exit(1);
+ System.exit(EXIT_VALUE);
}
public void checkExit(int status) {
diff -r be8643ebe865 -r 6665640c56cf jdk/test/java/rmi/registry/altSecurityManager/registry.security.policy
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/rmi/registry/altSecurityManager/registry.security.policy Wed Jul 05 22:41:30 2017 +0200
@@ -0,0 +1,8 @@
+grant {
+ permission java.lang.RuntimePermission "accessClassInPackage.sun.rmi.registry";
+ permission java.util.PropertyPermission "env.class.path", "read";
+ permission java.io.FilePermission ".", "read";
+ permission java.util.PropertyPermission "user.dir", "read";
+ permission java.lang.RuntimePermission "createClassLoader";
+ permission java.lang.RuntimePermission "setContextClassLoader";
+};
diff -r be8643ebe865 -r 6665640c56cf jdk/test/java/rmi/registry/altSecurityManager/rmid.security.policy
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/rmi/registry/altSecurityManager/rmid.security.policy Wed Jul 05 22:41:30 2017 +0200
@@ -0,0 +1,7 @@
+grant {
+ permission java.lang.RuntimePermission "selectorProvider";
+ permission java.lang.RuntimePermission "accessClassInPackage.sun.nio.ch";
+ permission java.util.PropertyPermission "test.java.rmi.testlibrary.RMIDSelectorProvider.port", "read";
+ permission java.util.PropertyPermission "test.java.rmi.testlibrary.RMIDSelectorProvider.timeout", "read";
+ permission java.net.SocketPermission "*:1024-", "listen,resolve,connect,accept";
+};
diff -r be8643ebe865 -r 6665640c56cf jdk/test/java/rmi/registry/classPathCodebase/ClassPathCodebase.java
--- a/jdk/test/java/rmi/registry/classPathCodebase/ClassPathCodebase.java Fri Jan 13 01:36:02 2017 +0000
+++ b/jdk/test/java/rmi/registry/classPathCodebase/ClassPathCodebase.java Wed Jul 05 22:41:30 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 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
@@ -34,7 +34,7 @@
* java.rmi/sun.rmi.server
* java.rmi/sun.rmi.transport
* java.rmi/sun.rmi.transport.tcp
- * @build TestLibrary Dummy
+ * @build TestLibrary Dummy RegistryVM RMIRegistryRunner
* @run main/othervm/policy=security.policy
* -Djava.rmi.server.useCodebaseOnly=false ClassPathCodebase
*/
@@ -48,8 +48,9 @@
public class ClassPathCodebase {
- /** wait 10 seconds for the registry process to be ready to call */
- private final static long REGISTRY_WAIT = 15000;
+ /** wait dozens of seconds for the registry process to be ready to call */
+ private static final long REGISTRY_WAIT =
+ (long)(10000 * TestLibrary.getTimeoutFactor());
private final static String dummyClassName = "Dummy";
@@ -64,7 +65,7 @@
TestLibrary.suggestSecurityManager("java.lang.SecurityManager");
- Process rmiregistry = null;
+ RegistryVM rmiregistry = null;
try {
/*
@@ -82,27 +83,13 @@
* Spawn an rmiregistry in the "import" codebase directory.
*/
File rmiregistryDir =
- new File(System.getProperty("user.dir", "."), importCodebase);
-
- String rmiregistryCommand =
- System.getProperty("java.home") + File.separator +
- "bin" + File.separator + "rmiregistry";
-
- int port = TestLibrary.getUnusedRandomPort();
- String cmdarray[] = new String[] {
- rmiregistryCommand,
- "-J-Denv.class.path=.",
- "-J-Djava.rmi.server.codebase=" + exportCodebaseURL,
- Integer.toString(port) };
-
- System.err.println("\nCommand used to spawn rmiregistry process:");
- System.err.println("\t" + Arrays.asList(cmdarray).toString());
-
- rmiregistry = Runtime.getRuntime().exec(cmdarray, null, rmiregistryDir);
-
- // pipe rmiregistry output to our output, for debugging failures
- StreamPipe.plugTogether(rmiregistry.getInputStream(), System.err);
- StreamPipe.plugTogether(rmiregistry.getErrorStream(), System.err);
+ new File(System.getProperty("user.dir", "."), importCodebase);
+ rmiregistry = RegistryVM.createRegistryVMWithRunner("RMIRegistryRunner",
+ " -Denv.class.path=."
+ + " -Djava.rmi.server.codebase=" + exportCodebaseURL
+ + " -Duser.dir=" + rmiregistryDir.getAbsolutePath());
+ rmiregistry.start();
+ int port = rmiregistry.getPort();
/*
* Wait for the registry to initialize and be ready to call.
@@ -174,7 +161,7 @@
throw new RuntimeException("TEST FAILED: " + e.toString());
} finally {
if (rmiregistry != null) {
- rmiregistry.destroy();
+ rmiregistry.cleanup();
}
}
}
diff -r be8643ebe865 -r 6665640c56cf jdk/test/java/rmi/registry/classPathCodebase/registry.security.policy
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/rmi/registry/classPathCodebase/registry.security.policy Wed Jul 05 22:41:30 2017 +0200
@@ -0,0 +1,18 @@
+/*
+ * security policy used by the registry process started by RegistryVM.
+ */
+
+grant {
+ permission java.lang.RuntimePermission "accessClassInPackage.sun.rmi.registry";
+ permission java.util.PropertyPermission "env.class.path", "read";
+ permission java.io.FilePermission ".", "read";
+ permission java.util.PropertyPermission "user.dir", "read";
+ permission java.lang.RuntimePermission "createClassLoader";
+ permission java.lang.RuntimePermission "setContextClassLoader";
+ permission java.io.FilePermission ".-Djava.rmi.server.codebase=file", "read";
+ permission java.io.FilePermission ".${/}-", "read";
+ permission java.lang.RuntimePermission "accessClassInPackage.sun.rmi.server";
+ permission java.lang.RuntimePermission "accessClassInPackage.sun.rmi.transport";
+ permission java.lang.RuntimePermission "accessClassInPackage.sun.rmi.transport.tcp";
+ permission java.net.SocketPermission "*:1024-", "listen,resolve,connect,accept";
+};
diff -r be8643ebe865 -r 6665640c56cf jdk/test/java/rmi/registry/classPathCodebase/security.policy
--- a/jdk/test/java/rmi/registry/classPathCodebase/security.policy Fri Jan 13 01:36:02 2017 +0000
+++ b/jdk/test/java/rmi/registry/classPathCodebase/security.policy Wed Jul 05 22:41:30 2017 +0200
@@ -18,6 +18,12 @@
// test needs to use java to exec an rmiregistry
permission java.io.FilePermission "${java.home}${/}bin${/}-", "execute";
- // test needs to communicate with this its registry
+ // test needs to communicate with its registry
permission java.net.SocketPermission "*:1024-", "connect,accept,listen";
+
+ permission java.util.PropertyPermission "java.security.policy", "read";
+ permission java.util.PropertyPermission "java.security.manager", "read";
+
+ // used by TestLibrary to determine extra commandline properties
+ permission java.io.FilePermission "..${/}..${/}test.props", "read";
};
diff -r be8643ebe865 -r 6665640c56cf jdk/test/java/rmi/registry/readTest/CodebaseTest.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/rmi/registry/readTest/CodebaseTest.java Wed Jul 05 22:41:30 2017 +0200
@@ -0,0 +1,90 @@
+/*
+ * Copyright (c) 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.
+ *
+ * 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.
+ */
+
+/* @test
+ * @bug 7102369 7094468 7100592
+ * @modules java.rmi/sun.rmi.registry
+ * java.rmi/sun.rmi.server
+ * java.rmi/sun.rmi.transport
+ * java.rmi/sun.rmi.transport.tcp
+ * @library ../../testlibrary
+ * @build TestLibrary RMIRegistryRunner RegistryVM JavaVM testPkg.* RegistryLookup
+ * @summary remove java.rmi.server.codebase property parsing from registyimpl
+ * @run main/othervm CodebaseTest
+*/
+
+import java.io.File;
+import java.nio.file.Files;
+import java.nio.file.StandardCopyOption;
+import java.rmi.registry.Registry;
+import java.rmi.registry.LocateRegistry;
+import java.rmi.RemoteException;
+import java.rmi.server.UnicastRemoteObject;
+
+public class CodebaseTest {
+
+ public static void main(String args[]) throws Exception {
+ RegistryVM rmiregistry = null;
+ JavaVM client = null;
+ try {
+ File src = new File(System.getProperty("test.classes", "."), "testPkg");
+ File dest = new File(System.getProperty("user.dir", "."), "testPkg");
+ Files.move(src.toPath(), dest.toPath(),
+ StandardCopyOption.REPLACE_EXISTING);
+
+ File rmiregistryDir =
+ new File(System.getProperty("user.dir", "."), "rmi_tmp");
+ rmiregistryDir.mkdirs();
+ rmiregistry = RegistryVM.createRegistryVMWithRunner(
+ "RMIRegistryRunner",
+ " -Djava.rmi.server.useCodebaseOnly=false"
+ + " -Duser.dir=" + rmiregistryDir.getAbsolutePath());
+ rmiregistry.start();
+ int port = rmiregistry.getPort();
+
+ File srcReadTest = new File(System.getProperty("test.classes", "."),
+ "RegistryLookup.class");
+ File destReadTest = new File(System.getProperty("user.dir", "."),
+ "RegistryLookup.class");
+ Files.move(srcReadTest.toPath(), destReadTest.toPath(),
+ StandardCopyOption.REPLACE_EXISTING);
+
+ File codebase = new File(System.getProperty("user.dir", "."));
+ client = new JavaVM("RegistryLookup",
+ " -Djava.rmi.server.codebase=" + codebase.toURI().toURL()
+ + " -cp ." + File.pathSeparator + System.getProperty("test.class.path"),
+ Integer.toString(port));
+ int exit = client.execute();
+ if (exit == RegistryLookup.EXIT_FAIL) {
+ throw new RuntimeException("Test Fails");
+ }
+ } finally {
+ if (rmiregistry != null) {
+ rmiregistry.cleanup();
+ }
+ if (client != null) {
+ client.cleanup();
+ }
+ }
+ }
+}
diff -r be8643ebe865 -r 6665640c56cf jdk/test/java/rmi/registry/readTest/RegistryLookup.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/rmi/registry/readTest/RegistryLookup.java Wed Jul 05 22:41:30 2017 +0200
@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) 2011, 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.
+ *
+ * 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.
+ */
+
+import java.rmi.registry.Registry;
+import java.rmi.registry.LocateRegistry;
+import java.rmi.RemoteException;
+import java.rmi.server.UnicastRemoteObject;
+
+public class RegistryLookup {
+ public static final int EXIT_FAIL = 1;
+
+ public static void main(String args[]) throws Exception {
+ Registry registry = null;
+ int exit = 0;
+ try {
+ int port = Integer.valueOf(args[0]);
+
+ testPkg.Server obj = new testPkg.Server();
+ testPkg.Hello stub =
+ (testPkg.Hello) UnicastRemoteObject.exportObject(obj, 0);
+ // Bind the remote object's stub in the registry
+ registry = LocateRegistry.getRegistry(port);
+ registry.bind("Hello", stub);
+ System.err.println("Server ready");
+
+ testPkg.Client client = new testPkg.Client(port);
+ String testStubReturn = client.testStub();
+ if(!testStubReturn.equals(obj.hello)) {
+ throw new RuntimeException("Test Fails : "
+ + "unexpected string from stub call");
+ }
+ registry.unbind("Hello");
+ System.out.println("Test passed");
+ } catch (Exception ex) {
+ exit = EXIT_FAIL;
+ ex.printStackTrace();
+ }
+ // need to exit explicitly, and parent process uses exit value
+ // to tell if the test passed.
+ System.exit(exit);
+ }
+}
diff -r be8643ebe865 -r 6665640c56cf jdk/test/java/rmi/registry/readTest/readTest.java
--- a/jdk/test/java/rmi/registry/readTest/readTest.java Fri Jan 13 01:36:02 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,59 +0,0 @@
-/*
- * Copyright (c) 2011, 2012, 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.
- *
- * 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.
- */
-
-import java.rmi.registry.Registry;
-import java.rmi.registry.LocateRegistry;
-import java.rmi.RemoteException;
-import java.rmi.server.UnicastRemoteObject;
-
-public class readTest {
-
- public static void main(String args[]) throws Exception {
- try {
- testPkg.Server obj = new testPkg.Server();
- testPkg.Hello stub = (testPkg.Hello) UnicastRemoteObject.exportObject(obj, 0);
- // Bind the remote object's stub in the registry
- Registry registry =
- LocateRegistry.getRegistry(TestLibrary.READTEST_REGISTRY_PORT);
- registry.bind("Hello", stub);
-
- System.err.println("Server ready");
-
- // now, let's test client
- testPkg.Client client =
- new testPkg.Client(TestLibrary.READTEST_REGISTRY_PORT);
- String testStubReturn = client.testStub();
- if(!testStubReturn.equals(obj.hello)) {
- throw new RuntimeException("Test Fails : unexpected string from stub call");
- } else {
- System.out.println("Test passed");
- }
- registry.unbind("Hello");
-
- } catch (Exception e) {
- System.err.println("Server exception: " + e.toString());
- e.printStackTrace();
- }
-
- }
-}
diff -r be8643ebe865 -r 6665640c56cf jdk/test/java/rmi/registry/readTest/readTest.sh
--- a/jdk/test/java/rmi/registry/readTest/readTest.sh Fri Jan 13 01:36:02 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,137 +0,0 @@
-#
-# Copyright (c) 2011, 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.
-#
-# 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.
-#
-
-# @test
-# @bug 7102369 7094468 7100592
-# @modules java.rmi/sun.rmi.registry
-# java.rmi/sun.rmi.server
-# java.rmi/sun.rmi.transport
-# java.rmi/sun.rmi.transport.tcp
-# @library ../../testlibrary
-# @build TestLibrary
-# @summary remove java.rmi.server.codebase property parsing from registyimpl
-# @run shell readTest.sh
-# @key intermittent
-
-OS=`uname -s`
-VER=`uname -r`
-ARGS=""
-REGARGS=""
-
-case "$OS" in
- SunOS | Linux | Darwin | AIX )
- PS=":"
- FS="/"
- CHMOD="${FS}bin${FS}chmod"
- FILEURL="file:"
- ;;
- Windows* )
- PS=";"
- FS="\\"
- CHMOD="chmod"
- FILEURL="file:/"
- if [ "$VER" -eq "5" ]; then
- ARGS="-Djdk.net.ephemeralPortRange.low=1024 -Djdk.net.ephemeralPortRange.high=65000"
- REGARGS="-J-Djdk.net.ephemeralPortRange.low=1024 -J-Djdk.net.ephemeralPortRange.high=65000"
- fi
- ;;
- CYGWIN* )
- PS=";"
- FS="/"
- CHMOD="chmod"
- FILEURL="file:/"
- if [ "$VER" -eq "5" ]; then
- ARGS="-Djdk.net.ephemeralPortRange.low=1024 -Djdk.net.ephemeralPortRange.high=65000"
- REGARGS="-J-Djdk.net.ephemeralPortRange.low=1024 -J-Djdk.net.ephemeralPortRange.high=65000"
- fi
- ;;
- * )
- echo "Unrecognized system!"
- exit 1;
- ;;
-esac
-
-TEST_CLASSPATH=.$PS${TESTCLASSPATH:-$TESTCLASSES}
-cp -r ${TESTSRC}${FS}* .
-${CHMOD} -R u+w *
-${COMPILEJAVA}${FS}bin${FS}javac ${TESTJAVACOPTS} ${TESTTOOLVMOPTS} testPkg${FS}*java
-${COMPILEJAVA}${FS}bin${FS}javac ${TESTJAVACOPTS} ${TESTTOOLVMOPTS} -cp $TEST_CLASSPATH readTest.java
-
-mkdir rmi_tmp
-RMIREG_OUT=rmi.out
-#start rmiregistry without any local classes on classpath
-cd rmi_tmp
-# NOTE: This RMI Registry port must match TestLibrary.READTEST_REGISTRY_PORT
-${TESTJAVA}${FS}bin${FS}rmiregistry ${REGARGS} -J-Djava.rmi.server.useCodebaseOnly=false \
- ${TESTTOOLVMOPTS} 60005 > ..${FS}${RMIREG_OUT} 2>&1 &
-RMIREG_PID=$!
-# allow some time to start
-sleep 3
-cd ..
-
-case "$OS" in
- CYGWIN* )
- CODEBASE=`cygpath -w $PWD`
- ;;
- * )
- CODEBASE=`pwd`
- ;;
-esac
-# trailing / after code base is important for rmi codebase property.
-TESTVMOPTS="${TESTVMOPTS} \
- --add-exports java.rmi/sun.rmi.registry=ALL-UNNAMED \
- --add-exports java.rmi/sun.rmi.server=ALL-UNNAMED \
- --add-exports java.rmi/sun.rmi.transport=ALL-UNNAMED \
- --add-exports java.rmi/sun.rmi.transport.tcp=ALL-UNNAMED"
-${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} -cp $TEST_CLASSPATH ${ARGS} -Djava.rmi.server.codebase=${FILEURL}$CODEBASE/ readTest > OUT.TXT 2>&1 &
-TEST_PID=$!
-#bulk of testcase - let it run for a while
-sleep 5
-
-#we're done, kill processes first
-kill -9 ${RMIREG_PID} ${TEST_PID}
-sleep 3
-
-echo "Test output : "
-
-cat OUT.TXT
-echo "=============="
-echo "rmiregistry output : "
-cat ${RMIREG_OUT}
-echo "=============="
-
-grep "Server ready" OUT.TXT
-result1=$?
-grep "Test passed" OUT.TXT
-result2=$?
-
-if [ $result1 -eq 0 -a $result2 -eq 0 ]
-then
- echo "Passed"
- exitCode=0;
-else
- echo "Failed"
- exitCode=1
-fi
-rm -rf OUT.TXT ${RMIREG_OUT} rmi_tmp
-exit ${exitCode}
diff -r be8643ebe865 -r 6665640c56cf jdk/test/java/rmi/registry/readTest/registry.security.policy
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/rmi/registry/readTest/registry.security.policy Wed Jul 05 22:41:30 2017 +0200
@@ -0,0 +1,12 @@
+grant {
+ permission java.lang.RuntimePermission "accessClassInPackage.sun.rmi.registry";
+ permission java.util.PropertyPermission "env.class.path", "read";
+ permission java.io.FilePermission ".", "read";
+ permission java.util.PropertyPermission "user.dir", "read";
+ permission java.lang.RuntimePermission "createClassLoader";
+ permission java.lang.RuntimePermission "setContextClassLoader";
+ permission java.lang.RuntimePermission "accessClassInPackage.sun.rmi.server";
+ permission java.lang.RuntimePermission "accessClassInPackage.sun.rmi.transport";
+ permission java.lang.RuntimePermission "accessClassInPackage.sun.rmi.transport.tcp";
+ permission java.net.SocketPermission "*:1024-", "listen,resolve,connect,accept";
+};
diff -r be8643ebe865 -r 6665640c56cf jdk/test/java/rmi/registry/reexport/Reexport.java
--- a/jdk/test/java/rmi/registry/reexport/Reexport.java Fri Jan 13 01:36:02 2017 +0000
+++ b/jdk/test/java/rmi/registry/reexport/Reexport.java Wed Jul 05 22:41:30 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 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
@@ -29,7 +29,7 @@
* java.rmi/sun.rmi.server
* java.rmi/sun.rmi.transport
* java.rmi/sun.rmi.transport.tcp
- * @build TestLibrary REGISTRY RegistryRunner
+ * @build TestLibrary RegistryVM RegistryRunner
* @run main/othervm Reexport
*/
@@ -114,7 +114,7 @@
public static void makeRegistry() {
try {
- subreg = REGISTRY.createREGISTRY();
+ subreg = RegistryVM.createRegistryVM();
subreg.start();
port = subreg.getPort();
System.out.println("Starting registry on port " + port);
@@ -125,12 +125,12 @@
}
}
- private static REGISTRY subreg = null;
+ private static RegistryVM subreg = null;
private static int port = -1;
public static void killRegistry() {
if (subreg != null) {
- subreg.shutdown();
+ subreg.cleanup();
subreg = null;
}
}
diff -r be8643ebe865 -r 6665640c56cf jdk/test/java/rmi/testlibrary/JavaVM.java
--- a/jdk/test/java/rmi/testlibrary/JavaVM.java Fri Jan 13 01:36:02 2017 +0000
+++ b/jdk/test/java/rmi/testlibrary/JavaVM.java Wed Jul 05 22:41:30 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2016, Oracle and/or its affiliates. All rights reserved.
+ * 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
@@ -230,6 +230,22 @@
}
/**
+ * Return exit value for vm process.
+ * @return exit value for vm process
+ * @throws IllegalThreadStateException if the vm process has not yet terminated
+ */
+ public int exitValue() {
+ return vm.exitValue();
+ }
+
+ /**
+ * Destroy the vm process, and do necessary cleanup.
+ */
+ public void cleanup() {
+ destroy();
+ }
+
+ /**
* Destroys the VM, waits for it to terminate, and returns
* its exit status.
*
diff -r be8643ebe865 -r 6665640c56cf jdk/test/java/rmi/testlibrary/REGISTRY.java
--- a/jdk/test/java/rmi/testlibrary/REGISTRY.java Fri Jan 13 01:36:02 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,119 +0,0 @@
-/*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * 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.
- */
-
-import java.io.OutputStream;
-import java.io.IOException;
-
-/**
- * Class to run and control rmiregistry in a sub-process.
- *
- * We can't kill a registry if we have too-close control
- * over it. We must make it in a subprocess, and then kill the
- * subprocess when it has served our needs.
- */
-public class REGISTRY extends JavaVM {
-
- private static final double START_TIMEOUT =
- 20_000 * TestLibrary.getTimeoutFactor();
- private static final String DEFAULT_RUNNER = "RegistryRunner";
-
- private int port = -1;
-
- private REGISTRY(String runner, OutputStream out, OutputStream err,
- String options, int port) {
- super(runner, options, Integer.toString(port), out, err);
- try {
- Class runnerClass = Class.forName(runner);
- if (!RegistryRunner.class.isAssignableFrom(runnerClass)) {
- throw new RuntimeException("runner class must be RegistryRunner"
- + " or its sub class");
- }
- } catch (ClassNotFoundException ex) {
- throw new RuntimeException(ex);
- }
- this.port = port;
- }
-
- public static REGISTRY createREGISTRY() {
- return createREGISTRYWithRunner(DEFAULT_RUNNER, System.out, System.err, "", 0);
- }
-
- public static REGISTRY createREGISTRY(OutputStream out, OutputStream err,
- String options, int port) {
- return createREGISTRYWithRunner(DEFAULT_RUNNER, out, err, options, port);
- }
-
- public static REGISTRY createREGISTRYWithRunner(String runner, String options) {
- return createREGISTRYWithRunner(runner, System.out, System.err, options, 0);
- }
-
- public static REGISTRY createREGISTRYWithRunner(String runner, OutputStream out,
- OutputStream err, String options, int port) {
- options += " --add-exports=java.rmi/sun.rmi.registry=ALL-UNNAMED"
- + " --add-exports=java.rmi/sun.rmi.server=ALL-UNNAMED"
- + " --add-exports=java.rmi/sun.rmi.transport=ALL-UNNAMED"
- + " --add-exports=java.rmi/sun.rmi.transport.tcp=ALL-UNNAMED";
- REGISTRY reg = new REGISTRY(runner, out, err, options, port);
- return reg;
- }
-
- /**
- * Starts the registry in a sub-process and waits up to
- * the given timeout period to confirm that it's running,
- * and get the port where it's running.
- */
- public void start() throws IOException {
- super.start();
- long startTime = System.currentTimeMillis();
- long deadline = TestLibrary.computeDeadline(startTime, (long)START_TIMEOUT);
- while (true) {
- try {
- Thread.sleep(1000);
- } catch (InterruptedException ignore) { }
-
- String output = outputStream.ba.toString();
- port = RegistryRunner.getRegistryPort(output);
- if (port != -1) {
- break;
- }
- if (System.currentTimeMillis() > deadline) {
- TestLibrary.bomb("Failed to start registry, giving up after " +
- (System.currentTimeMillis() - startTime) + "ms.", null);
- }
- }
- }
-
- /**
- * Shuts down the registry.
- */
- public void shutdown() {
- RegistryRunner.requestExit(port);
- }
-
- /**
- * Gets the port where the registry is serving.
- */
- public int getPort() {
- return port;
- }
-}
diff -r be8643ebe865 -r 6665640c56cf jdk/test/java/rmi/testlibrary/RMID.java
--- a/jdk/test/java/rmi/testlibrary/RMID.java Fri Jan 13 01:36:02 2017 +0000
+++ b/jdk/test/java/rmi/testlibrary/RMID.java Wed Jul 05 22:41:30 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2016, Oracle and/or its affiliates. All rights reserved.
+ * 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
@@ -140,18 +140,6 @@
}
private static String makeArgs(boolean includePortArg, int port) {
- String propagateManager = null;
-
- // rmid will run with a security manager set, but no policy
- // file - it should not need one.
- if (System.getSecurityManager() == null) {
- propagateManager = MANAGER_OPTION +
- TestParams.defaultSecurityManager;
- } else {
- propagateManager = MANAGER_OPTION +
- System.getSecurityManager().getClass().getName();
- }
-
// getAbsolutePath requires permission to read user.dir
String args =
" -log " + (new File(LOGDIR, log)).getAbsolutePath();
@@ -210,7 +198,30 @@
boolean debugExec, boolean includePortArg,
int port)
{
+ return createRMIDWithOptions(out, err, debugExec, includePortArg, port, "");
+ }
+
+ /**
+ * Create a RMID on a specified port capturing stdout and stderr
+ * with additional command line options and whether to print out
+ * debugging information that is used for spawning activation groups.
+ *
+ * @param out the OutputStream where the normal output of the
+ * rmid subprocess goes
+ * @param err the OutputStream where the error output of the
+ * rmid subprocess goes
+ * @param debugExec whether to print out debugging information
+ * @param includePortArg whether to include port argument
+ * @param port the port on which rmid accepts requests
+ * @param additionalOptions additional command line options
+ * @return a RMID instance
+ */
+ public static RMID createRMIDWithOptions(OutputStream out, OutputStream err,
+ boolean debugExec, boolean includePortArg,
+ int port, String additionalOptions)
+ {
String options = makeOptions(port, debugExec, false);
+ options += " " + additionalOptions;
String args = makeArgs(includePortArg, port);
RMID rmid = new RMID("sun.rmi.server.Activation", options, args,
out, err, port);
@@ -223,6 +234,19 @@
return createRMID(System.out, System.err, true, false, 0);
}
+ /**
+ * Create a RMID on an ephemeral port capturing stdout and stderr
+ * with additional command line options.
+ *
+ * @param additionalOptions additional command line options
+ * @return a RMID instance
+ */
+ public static RMID createRMIDOnEphemeralPortWithOptions(
+ String additionalOptions) {
+ return createRMIDWithOptions(System.out, System.err,
+ true, false, 0, additionalOptions);
+ }
+
public static RMID createRMIDOnEphemeralPort(OutputStream out,
OutputStream err,
boolean debugExec)
diff -r be8643ebe865 -r 6665640c56cf jdk/test/java/rmi/testlibrary/RMIRegistryRunner.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/rmi/testlibrary/RMIRegistryRunner.java Wed Jul 05 22:41:30 2017 +0200
@@ -0,0 +1,79 @@
+/*
+ * Copyright (c) 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.
+ *
+ * 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.
+ */
+
+/**/
+
+import java.rmi.*;
+import java.rmi.registry.*;
+import java.rmi.server.*;
+
+/**
+ * Class to run a rmiregistry whose VM can be told to exit remotely;
+ * Difference between this class and RegistryRunner is that this class
+ * simulate rmiregistry closer than RegistryRunner.
+ */
+public class RMIRegistryRunner extends RegistryRunner
+{
+ public RMIRegistryRunner() throws RemoteException {
+ }
+
+ /**
+ * port 0 means to use ephemeral port to start registry.
+ *
+ * @param args command line arguments passed in from main
+ * @return the port number on which registry accepts requests
+ */
+ protected static int init(String[] args) {
+ try {
+ if (args.length == 0) {
+ System.err.println("Usage: ");
+ System.exit(0);
+ }
+ int port = -1;
+ port = Integer.parseInt(args[0]);
+
+ // call RegistryImpl.createRegistry to simulate rmiregistry.
+ registry = sun.rmi.registry.RegistryImpl.createRegistry(port);
+ if (port == 0) {
+ port = TestLibrary.getRegistryPort(registry);
+ }
+
+ // create a remote object to tell this VM to exit
+ exiter = new RMIRegistryRunner();
+ Naming.rebind("rmi://localhost:" + port +
+ "/RemoteExiter", exiter);
+
+ return port;
+ } catch (Exception e) {
+ System.err.println(e.getMessage());
+ e.printStackTrace();
+ System.exit(1);
+ }
+ return -1;
+ }
+
+ public static void main(String[] args) {
+ int port = init(args);
+ notify(port);
+ }
+}
diff -r be8643ebe865 -r 6665640c56cf jdk/test/java/rmi/testlibrary/RegistryRunner.java
--- a/jdk/test/java/rmi/testlibrary/RegistryRunner.java Fri Jan 13 01:36:02 2017 +0000
+++ b/jdk/test/java/rmi/testlibrary/RegistryRunner.java Wed Jul 05 22:41:30 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 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
@@ -29,7 +29,7 @@
/**
* Class to run a registry whose VM can be told to exit remotely; using
- * the rmiregistry in this fashion makes tests more robust under
+ * a registry (in a sub-process) in this fashion makes tests more robust under
* windows where Process.destroy() seems not to be 100% reliable.
*/
public class RegistryRunner extends UnicastRemoteObject
@@ -38,8 +38,8 @@
private static final String PORT_LABEL_START = "RegistryRunner.port.start:";
private static final String PORT_LABEL_END = ":RegistryRunner.port.end";
- private static Registry registry = null;
- private static RemoteExiter exiter = null;
+ protected static Registry registry = null;
+ protected static RemoteExiter exiter = null;
public RegistryRunner() throws RemoteException {
}
@@ -72,6 +72,7 @@
} catch (RemoteException re) {
}
e = null;
+
} catch (java.net.MalformedURLException mfue) {
// will not happen
} catch (NotBoundException nbe) {
@@ -97,6 +98,9 @@
/**
* port 0 means to use ephemeral port to start registry.
+ *
+ * @param args command line arguments passed in from main
+ * @return the port number on which registry accepts requests
*/
protected static int init(String[] args) {
try {
@@ -128,13 +132,15 @@
}
/**
- * REGISTRY.start() will filter the output of registry subprocess,
- * when valid port is detected, REGISTRY.start() returns.
+ * RegistryVM.start() will filter the output of registry subprocess,
+ * when valid port is detected, RegistryVM.start() returns.
* So, for subclass, it's important to call this method after registry
* is initialized and necessary remote objects have been bound.
+ *
+ * @param port the port on which registry accepts requests
*/
protected static void notify(int port) {
- // this output is important for REGISTRY to get the port
+ // this output is important for RegistryVM to get the port
// where rmiregistry is serving
System.out.println(PORT_LABEL_START + port + PORT_LABEL_END);
System.out.flush();
diff -r be8643ebe865 -r 6665640c56cf jdk/test/java/rmi/testlibrary/RegistryVM.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/rmi/testlibrary/RegistryVM.java Wed Jul 05 22:41:30 2017 +0200
@@ -0,0 +1,184 @@
+/*
+ * Copyright (c) 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.
+ *
+ * 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.
+ */
+
+import java.io.OutputStream;
+import java.io.IOException;
+
+/**
+ * Class to run and control registry/rmiregistry in a sub-process.
+ * The behaviour changes when use different runner, currently
+ * there are 2 built-in runners, RegistryRunner and RMIRegistryRunner.
+ *
+ * We can't kill a registry if we have too-close control
+ * over it. We must make it in a subprocess, and then kill the
+ * subprocess when it has served our needs.
+ */
+public class RegistryVM extends JavaVM {
+
+ private static final double START_TIMEOUT =
+ 20_000 * TestLibrary.getTimeoutFactor();
+ private static final String DEFAULT_RUNNER = "RegistryRunner";
+
+ private int port = -1;
+
+ private RegistryVM(String runner, OutputStream out, OutputStream err,
+ String options, int port) {
+ super(runner, options, Integer.toString(port), out, err);
+ try {
+ Class runnerClass = Class.forName(runner);
+ if (!RegistryRunner.class.isAssignableFrom(runnerClass)) {
+ throw new RuntimeException("runner class must be RegistryRunner"
+ + " or its sub class");
+ }
+ } catch (ClassNotFoundException ex) {
+ throw new RuntimeException(ex);
+ }
+ this.port = port;
+ }
+
+ /**
+ * Create a RegistryVM instance on an ephemeral port.
+ *
+ * @return a RegistryVM instance
+ */
+ public static RegistryVM createRegistryVM() {
+ return createRegistryVMWithRunner(DEFAULT_RUNNER, System.out, System.err, "", 0);
+ }
+
+ /**
+ * Create a RegistryVM instance on an ephemeral port with additional
+ * command line options.
+ *
+ * @param options command line options
+ * @return a RegistryVM instance
+ */
+ public static RegistryVM createRegistryVM(String options) {
+ return createRegistryVMWithRunner(
+ DEFAULT_RUNNER, System.out, System.err, options, 0);
+ }
+
+ /**
+ * Create a RegistryVM instance on a specified port capturing stdout and
+ * stderr with additional command line options.
+ *
+ * @param out the OutputStream where the normal output of the
+ * registry subprocess goes
+ * @param err the OutputStream where the error output of the
+ * registry subprocess goes
+ * @param options the command line options
+ * @param port the port on which Registry accepts requests
+ * @return a RegistryVM instance
+ */
+ public static RegistryVM createRegistryVM(OutputStream out, OutputStream err,
+ String options, int port) {
+ return createRegistryVMWithRunner(DEFAULT_RUNNER, out, err, options, port);
+ }
+
+ /**
+ * Create a RegistryVM instance on an ephemeral port with additional
+ * command line options and a specified runner.
+ *
+ * @param runner the runner class name
+ * @param options command line options
+ * @return a RegistryVM instance
+ */
+ public static RegistryVM createRegistryVMWithRunner(String runner, String options) {
+ return createRegistryVMWithRunner(runner, System.out, System.err, options, 0);
+ }
+
+ /**
+ * Create a RegistryVM instance on a specified port capturing stdout and
+ * stderr with additional command line options and a specified runner.
+ *
+ * @param runner the runner class name
+ * @param out the OutputStream where the normal output of the
+ * registry subprocess goes
+ * @param err the OutputStream where the error output of the
+ * registry subprocess goes
+ * @param options the command line options
+ * @param port the port on which Registry accepts requests
+ * @return a RegistryVM instance
+ */
+ public static RegistryVM createRegistryVMWithRunner(String runner, OutputStream out,
+ OutputStream err, String options, int port) {
+ options += " --add-exports=java.rmi/sun.rmi.registry=ALL-UNNAMED"
+ + " --add-exports=java.rmi/sun.rmi.server=ALL-UNNAMED"
+ + " --add-exports=java.rmi/sun.rmi.transport=ALL-UNNAMED"
+ + " --add-exports=java.rmi/sun.rmi.transport.tcp=ALL-UNNAMED";
+ RegistryVM reg = new RegistryVM(runner, out, err, options, port);
+ reg.setPolicyFile(TestParams.defaultRegistryPolicy);
+ return reg;
+ }
+
+ /**
+ * Starts the registry in a sub-process and waits up to
+ * the given timeout period to confirm that it's running,
+ * and get the port where it's running.
+ *
+ * @throws IOException if fails to start subprocess
+ */
+ public void start() throws IOException {
+ super.start();
+ long startTime = System.currentTimeMillis();
+ long deadline = TestLibrary.computeDeadline(startTime, (long)START_TIMEOUT);
+ while (true) {
+ try {
+ Thread.sleep(1000);
+ } catch (InterruptedException ignore) { }
+
+ String output = outputStream.ba.toString();
+ port = RegistryRunner.getRegistryPort(output);
+ if (port != -1) {
+ break;
+ }
+ try {
+ int exit = vm.exitValue();
+ TestLibrary.bomb("[RegistryVM] registry sub-process exited with status "
+ + exit + ".");
+ } catch (IllegalThreadStateException ignore) { }
+
+ if (System.currentTimeMillis() > deadline) {
+ TestLibrary.bomb("Failed to start registry, giving up after " +
+ (System.currentTimeMillis() - startTime) + "ms.", null);
+ }
+ }
+ }
+
+ /**
+ * Shuts down the registry.
+ */
+ @Override
+ public void cleanup() {
+ RegistryRunner.requestExit(port);
+ super.destroy();
+ }
+
+ /**
+ * Gets the port where the registry is serving.
+ *
+ * @return the port where the registry is serving
+ */
+ public int getPort() {
+ return port;
+ }
+}
diff -r be8643ebe865 -r 6665640c56cf jdk/test/java/rmi/testlibrary/TestParams.java
--- a/jdk/test/java/rmi/testlibrary/TestParams.java Fri Jan 13 01:36:02 2017 +0000
+++ b/jdk/test/java/rmi/testlibrary/TestParams.java Wed Jul 05 22:41:30 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2014, Oracle and/or its affiliates. All rights reserved.
+ * 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
@@ -42,6 +42,9 @@
/** name of default security policy for RMID */
public static final String defaultRmidPolicy;
+ /** name of default security policy for RegistryVM */
+ public static final String defaultRegistryPolicy;
+
/** name of default security policy for activation groups */
public static final String defaultGroupPolicy;
@@ -69,6 +72,9 @@
defaultRmidPolicy =
testSrc + File.separatorChar + "rmid.security.policy";
+ defaultRegistryPolicy =
+ testSrc + File.separatorChar + "registry.security.policy";
+
defaultGroupPolicy =
testSrc + File.separatorChar + "group.security.policy";
diff -r be8643ebe865 -r 6665640c56cf jdk/test/java/rmi/transport/dgcDeadLock/DGCDeadLock.java
--- a/jdk/test/java/rmi/transport/dgcDeadLock/DGCDeadLock.java Fri Jan 13 01:36:02 2017 +0000
+++ b/jdk/test/java/rmi/transport/dgcDeadLock/DGCDeadLock.java Wed Jul 05 22:41:30 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2016, Oracle and/or its affiliates. All rights reserved.
+ * 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
@@ -33,7 +33,7 @@
* java.rmi/sun.rmi.server
* java.rmi/sun.rmi.transport
* java.rmi/sun.rmi.transport.tcp
- * @build TestLibrary Test TestImpl REGISTRY RegistryRunner
+ * @build TestLibrary Test TestImpl RegistryVM RegistryRunner
* @run main/othervm/policy=security.policy/timeout=360 DGCDeadLock
*/
@@ -68,21 +68,18 @@
static public void main(String[] args) {
- REGISTRY testImplVM = null;
+ RegistryVM testImplVM = null;
System.err.println("\nregression test for 4118056\n");
TestLibrary.suggestSecurityManager("java.rmi.RMISecurityManager");
try {
- String options = " -Djava.security.policy=" +
- TestParams.defaultPolicy +
- " --add-opens java.rmi/sun.rmi.transport=ALL-UNNAMED" +
+ String options = " --add-opens java.rmi/sun.rmi.transport=ALL-UNNAMED" +
" -Djava.rmi.dgc.leaseValue=500000" +
" -Dsun.rmi.dgc.checkInterval=" +
- (HOLD_TARGET_TIME - 5000) +
- "" ;
+ (HOLD_TARGET_TIME - 5000);
- testImplVM = REGISTRY.createREGISTRYWithRunner("TestImpl", options);
+ testImplVM = RegistryVM.createRegistryVMWithRunner("TestImpl", options);
testImplVM.start();
registryPort = testImplVM.getPort();
@@ -107,7 +104,7 @@
TestLibrary.bomb("test failed in main()", e);
} finally {
if (testImplVM != null) {
- testImplVM.shutdown();
+ testImplVM.cleanup();
testImplVM = null;
}
}
diff -r be8643ebe865 -r 6665640c56cf jdk/test/java/rmi/transport/dgcDeadLock/registry.security.policy
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/rmi/transport/dgcDeadLock/registry.security.policy Wed Jul 05 22:41:30 2017 +0200
@@ -0,0 +1,27 @@
+/*
+ * security policy used by the registry sub-process
+ */
+
+grant {
+ // used by TestLibrary to determine extra commandline properties
+ permission java.io.FilePermission "..${/}..${/}test.props", "read";
+
+ // property specifically accessed by this test.
+ permission java.util.PropertyPermission "sun.rmi.transport.cleanInterval", "write";
+ permission java.util.PropertyPermission "package.restrict.access.sun", "read";
+ permission java.util.PropertyPermission "package.restrict.access.sun.rmi", "read";
+
+ // test needs to use java to exec an EchoImpl object
+ permission java.io.FilePermission "${java.home}${/}bin${/}java", "execute";
+
+ // used by TestLibrary to determine test environment
+ permission java.util.PropertyPermission "test.*", "read";
+ permission java.util.PropertyPermission "user.dir", "read";
+ permission java.util.PropertyPermission "java.home", "read";
+
+ permission java.util.PropertyPermission "java.security.policy", "read";
+ permission java.util.PropertyPermission "java.security.manager", "read";
+
+ // test needs to export rmid and communicate with objects on arbitrary ports
+ permission java.net.SocketPermission "*:1024-", "connect,accept,listen";
+};
diff -r be8643ebe865 -r 6665640c56cf jdk/test/java/time/TEST.properties
--- a/jdk/test/java/time/TEST.properties Fri Jan 13 01:36:02 2017 +0000
+++ b/jdk/test/java/time/TEST.properties Wed Jul 05 22:41:30 2017 +0200
@@ -1,7 +1,6 @@
# Threeten test uses TestNG
TestNG.dirs = .
othervm.dirs = tck/java/time/chrono test/java/time/chrono test/java/time/format
-modules = jdk.localedata
lib.dirs = ../../lib/testlibrary
lib.build = jdk.testlibrary.RandomFactory
modules = java.base/java.time:open java.base/java.time.chrono:open java.base/java.time.zone:open
diff -r be8643ebe865 -r 6665640c56cf jdk/test/java/time/test/java/time/format/TestDateTimeFormatterBuilder.java
--- a/jdk/test/java/time/test/java/time/format/TestDateTimeFormatterBuilder.java Fri Jan 13 01:36:02 2017 +0000
+++ b/jdk/test/java/time/test/java/time/format/TestDateTimeFormatterBuilder.java Wed Jul 05 22:41:30 2017 +0200
@@ -880,25 +880,6 @@
}
//-----------------------------------------------------------------------
- @DataProvider(name="patternPrint")
- Object[][] data_patternPrint() {
- return new Object[][] {
- {"Q", date(2012, 2, 10), "1"},
- {"QQ", date(2012, 2, 10), "01"},
- {"QQQ", date(2012, 2, 10), "Q1"},
- {"QQQQ", date(2012, 2, 10), "1st quarter"},
- {"QQQQQ", date(2012, 2, 10), "1"},
- };
- }
-
- @Test(dataProvider="patternPrint")
- public void test_appendPattern_patternPrint(String input, Temporal temporal, String expected) throws Exception {
- DateTimeFormatter f = builder.appendPattern(input).toFormatter(Locale.UK);
- String test = f.format(temporal);
- assertEquals(test, expected);
- }
-
- //-----------------------------------------------------------------------
@DataProvider(name="localePatterns")
Object[][] localizedDateTimePatterns() {
return new Object[][] {
@@ -914,48 +895,6 @@
{null, FormatStyle.LONG, IsoChronology.INSTANCE, Locale.US, "h:mm:ss a z"},
{null, FormatStyle.MEDIUM, IsoChronology.INSTANCE, Locale.US, "h:mm:ss a"},
{null, FormatStyle.SHORT, IsoChronology.INSTANCE, Locale.US, "h:mm a"},
-
- // French Locale and ISO Chronology
- {FormatStyle.FULL, FormatStyle.FULL, IsoChronology.INSTANCE, Locale.FRENCH, "EEEE d MMMM y '\u00e0' HH:mm:ss zzzz"},
- {FormatStyle.LONG, FormatStyle.LONG, IsoChronology.INSTANCE, Locale.FRENCH, "d MMMM y '\u00e0' HH:mm:ss z"},
- {FormatStyle.MEDIUM, FormatStyle.MEDIUM, IsoChronology.INSTANCE, Locale.FRENCH, "d MMM y '\u00e0' HH:mm:ss"},
- {FormatStyle.SHORT, FormatStyle.SHORT, IsoChronology.INSTANCE, Locale.FRENCH, "dd/MM/y HH:mm"},
- {FormatStyle.FULL, null, IsoChronology.INSTANCE, Locale.FRENCH, "EEEE d MMMM y"},
- {FormatStyle.LONG, null, IsoChronology.INSTANCE, Locale.FRENCH, "d MMMM y"},
- {FormatStyle.MEDIUM, null, IsoChronology.INSTANCE, Locale.FRENCH, "d MMM y"},
- {FormatStyle.SHORT, null, IsoChronology.INSTANCE, Locale.FRENCH, "dd/MM/y"},
- {null, FormatStyle.FULL, IsoChronology.INSTANCE, Locale.FRENCH, "HH:mm:ss zzzz"},
- {null, FormatStyle.LONG, IsoChronology.INSTANCE, Locale.FRENCH, "HH:mm:ss z"},
- {null, FormatStyle.MEDIUM, IsoChronology.INSTANCE, Locale.FRENCH, "HH:mm:ss"},
- {null, FormatStyle.SHORT, IsoChronology.INSTANCE, Locale.FRENCH, "HH:mm"},
-
- // Japanese Locale and JapaneseChronology
- {FormatStyle.FULL, FormatStyle.FULL, JapaneseChronology.INSTANCE, Locale.JAPANESE, "Gy\u5e74M\u6708d\u65e5EEEE H\u6642mm\u5206ss\u79d2 zzzz"},
- {FormatStyle.LONG, FormatStyle.LONG, JapaneseChronology.INSTANCE, Locale.JAPANESE, "Gy\u5e74M\u6708d\u65e5 H:mm:ss z"},
- {FormatStyle.MEDIUM, FormatStyle.MEDIUM, JapaneseChronology.INSTANCE, Locale.JAPANESE, "Gy\u5e74M\u6708d\u65e5 H:mm:ss"},
- {FormatStyle.SHORT, FormatStyle.SHORT, JapaneseChronology.INSTANCE, Locale.JAPANESE, "GGGGGy/M/d H:mm"},
- {FormatStyle.FULL, null, JapaneseChronology.INSTANCE, Locale.JAPANESE, "Gy\u5e74M\u6708d\u65e5EEEE"},
- {FormatStyle.LONG, null, JapaneseChronology.INSTANCE, Locale.JAPANESE, "Gy\u5e74M\u6708d\u65e5"},
- {FormatStyle.MEDIUM, null, JapaneseChronology.INSTANCE, Locale.JAPANESE, "Gy\u5e74M\u6708d\u65e5"},
- {FormatStyle.SHORT, null, JapaneseChronology.INSTANCE, Locale.JAPANESE, "GGGGGy/M/d"},
- {null, FormatStyle.FULL, JapaneseChronology.INSTANCE, Locale.JAPANESE, "H\u6642mm\u5206ss\u79d2 zzzz"},
- {null, FormatStyle.LONG, JapaneseChronology.INSTANCE, Locale.JAPANESE, "H:mm:ss z"},
- {null, FormatStyle.MEDIUM, JapaneseChronology.INSTANCE, Locale.JAPANESE, "H:mm:ss"},
- {null, FormatStyle.SHORT, JapaneseChronology.INSTANCE, Locale.JAPANESE, "H:mm"},
-
- // Chinese Local and Chronology
- {FormatStyle.FULL, FormatStyle.FULL, MinguoChronology.INSTANCE, Locale.CHINESE, "Gy\u5e74M\u6708d\u65e5EEEE zzzz ah:mm:ss"},
- {FormatStyle.LONG, FormatStyle.LONG, MinguoChronology.INSTANCE, Locale.CHINESE, "Gy\u5e74M\u6708d\u65e5 z ah:mm:ss"},
- {FormatStyle.MEDIUM, FormatStyle.MEDIUM, MinguoChronology.INSTANCE, Locale.CHINESE, "Gy\u5e74M\u6708d\u65e5 ah:mm:ss"},
- {FormatStyle.SHORT, FormatStyle.SHORT, MinguoChronology.INSTANCE, Locale.CHINESE, "Gyy/M/d ah:mm"},
- {FormatStyle.FULL, null, MinguoChronology.INSTANCE, Locale.CHINESE, "Gy\u5e74M\u6708d\u65e5EEEE"},
- {FormatStyle.LONG, null, MinguoChronology.INSTANCE, Locale.CHINESE, "Gy\u5e74M\u6708d\u65e5"},
- {FormatStyle.MEDIUM, null, MinguoChronology.INSTANCE, Locale.CHINESE, "Gy\u5e74M\u6708d\u65e5"},
- {FormatStyle.SHORT, null, MinguoChronology.INSTANCE, Locale.CHINESE, "Gyy/M/d"},
- {null, FormatStyle.FULL, MinguoChronology.INSTANCE, Locale.CHINESE, "zzzz ah:mm:ss"},
- {null, FormatStyle.LONG, MinguoChronology.INSTANCE, Locale.CHINESE, "z ah:mm:ss"},
- {null, FormatStyle.MEDIUM, MinguoChronology.INSTANCE, Locale.CHINESE, "ah:mm:ss"},
- {null, FormatStyle.SHORT, MinguoChronology.INSTANCE, Locale.CHINESE, "ah:mm"},
};
}
@@ -1004,5 +943,4 @@
private static Temporal date(int y, int m, int d) {
return LocalDate.of(y, m, d);
}
-
}
diff -r be8643ebe865 -r 6665640c56cf jdk/test/java/time/test/java/time/format/TestDateTimeFormatterBuilderWithLocale.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/time/test/java/time/format/TestDateTimeFormatterBuilderWithLocale.java Wed Jul 05 22:41:30 2017 +0200
@@ -0,0 +1,195 @@
+/*
+ * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file:
+ *
+ * Copyright (c) 2009-2012, Stephen Colebourne & Michael Nascimento Santos
+ *
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * * Neither the name of JSR-310 nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/*
+ * @test
+ * @modules jdk.localedata
+ */
+package test.java.time.format;
+
+import java.time.chrono.Chronology;
+import java.time.chrono.IsoChronology;
+import java.time.chrono.JapaneseChronology;
+import java.time.chrono.MinguoChronology;
+import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeFormatterBuilder;
+import java.time.format.FormatStyle;
+import java.time.LocalDate;
+import java.time.temporal.Temporal;
+
+import java.util.Locale;
+
+import static org.testng.Assert.assertEquals;
+
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+
+/**
+ * Test DateTimeFormatterBuilder.
+ */
+@Test
+public class TestDateTimeFormatterBuilderWithLocale {
+
+ private DateTimeFormatterBuilder builder;
+
+ @BeforeMethod
+ public void setUp() {
+ builder = new DateTimeFormatterBuilder();
+ }
+
+ //-----------------------------------------------------------------------
+ @DataProvider(name="patternPrint")
+ Object[][] data_patternPrint() {
+ return new Object[][] {
+ {"Q", date(2012, 2, 10), "1"},
+ {"QQ", date(2012, 2, 10), "01"},
+ {"QQQ", date(2012, 2, 10), "Q1"},
+ {"QQQQ", date(2012, 2, 10), "1st quarter"},
+ {"QQQQQ", date(2012, 2, 10), "1"},
+ };
+ }
+
+ @Test(dataProvider="patternPrint")
+ public void test_appendPattern_patternPrint(String input, Temporal temporal, String expected) throws Exception {
+ DateTimeFormatter f = builder.appendPattern(input).toFormatter(Locale.UK);
+ String test = f.format(temporal);
+ assertEquals(test, expected);
+ }
+
+ //-----------------------------------------------------------------------
+ @DataProvider(name="localePatterns")
+ Object[][] localizedDateTimePatterns() {
+ return new Object[][] {
+ // French Locale and ISO Chronology
+ {FormatStyle.FULL, FormatStyle.FULL, IsoChronology.INSTANCE, Locale.FRENCH, "EEEE d MMMM y '\u00e0' HH:mm:ss zzzz"},
+ {FormatStyle.LONG, FormatStyle.LONG, IsoChronology.INSTANCE, Locale.FRENCH, "d MMMM y '\u00e0' HH:mm:ss z"},
+ {FormatStyle.MEDIUM, FormatStyle.MEDIUM, IsoChronology.INSTANCE, Locale.FRENCH, "d MMM y '\u00e0' HH:mm:ss"},
+ {FormatStyle.SHORT, FormatStyle.SHORT, IsoChronology.INSTANCE, Locale.FRENCH, "dd/MM/y HH:mm"},
+ {FormatStyle.FULL, null, IsoChronology.INSTANCE, Locale.FRENCH, "EEEE d MMMM y"},
+ {FormatStyle.LONG, null, IsoChronology.INSTANCE, Locale.FRENCH, "d MMMM y"},
+ {FormatStyle.MEDIUM, null, IsoChronology.INSTANCE, Locale.FRENCH, "d MMM y"},
+ {FormatStyle.SHORT, null, IsoChronology.INSTANCE, Locale.FRENCH, "dd/MM/y"},
+ {null, FormatStyle.FULL, IsoChronology.INSTANCE, Locale.FRENCH, "HH:mm:ss zzzz"},
+ {null, FormatStyle.LONG, IsoChronology.INSTANCE, Locale.FRENCH, "HH:mm:ss z"},
+ {null, FormatStyle.MEDIUM, IsoChronology.INSTANCE, Locale.FRENCH, "HH:mm:ss"},
+ {null, FormatStyle.SHORT, IsoChronology.INSTANCE, Locale.FRENCH, "HH:mm"},
+
+ // Japanese Locale and JapaneseChronology
+ {FormatStyle.FULL, FormatStyle.FULL, JapaneseChronology.INSTANCE, Locale.JAPANESE, "Gy\u5e74M\u6708d\u65e5EEEE H\u6642mm\u5206ss\u79d2 zzzz"},
+ {FormatStyle.LONG, FormatStyle.LONG, JapaneseChronology.INSTANCE, Locale.JAPANESE, "Gy\u5e74M\u6708d\u65e5 H:mm:ss z"},
+ {FormatStyle.MEDIUM, FormatStyle.MEDIUM, JapaneseChronology.INSTANCE, Locale.JAPANESE, "Gy\u5e74M\u6708d\u65e5 H:mm:ss"},
+ {FormatStyle.SHORT, FormatStyle.SHORT, JapaneseChronology.INSTANCE, Locale.JAPANESE, "GGGGGy/M/d H:mm"},
+ {FormatStyle.FULL, null, JapaneseChronology.INSTANCE, Locale.JAPANESE, "Gy\u5e74M\u6708d\u65e5EEEE"},
+ {FormatStyle.LONG, null, JapaneseChronology.INSTANCE, Locale.JAPANESE, "Gy\u5e74M\u6708d\u65e5"},
+ {FormatStyle.MEDIUM, null, JapaneseChronology.INSTANCE, Locale.JAPANESE, "Gy\u5e74M\u6708d\u65e5"},
+ {FormatStyle.SHORT, null, JapaneseChronology.INSTANCE, Locale.JAPANESE, "GGGGGy/M/d"},
+ {null, FormatStyle.FULL, JapaneseChronology.INSTANCE, Locale.JAPANESE, "H\u6642mm\u5206ss\u79d2 zzzz"},
+ {null, FormatStyle.LONG, JapaneseChronology.INSTANCE, Locale.JAPANESE, "H:mm:ss z"},
+ {null, FormatStyle.MEDIUM, JapaneseChronology.INSTANCE, Locale.JAPANESE, "H:mm:ss"},
+ {null, FormatStyle.SHORT, JapaneseChronology.INSTANCE, Locale.JAPANESE, "H:mm"},
+
+ // Chinese Local and Chronology
+ {FormatStyle.FULL, FormatStyle.FULL, MinguoChronology.INSTANCE, Locale.CHINESE, "Gy\u5e74M\u6708d\u65e5EEEE zzzz ah:mm:ss"},
+ {FormatStyle.LONG, FormatStyle.LONG, MinguoChronology.INSTANCE, Locale.CHINESE, "Gy\u5e74M\u6708d\u65e5 z ah:mm:ss"},
+ {FormatStyle.MEDIUM, FormatStyle.MEDIUM, MinguoChronology.INSTANCE, Locale.CHINESE, "Gy\u5e74M\u6708d\u65e5 ah:mm:ss"},
+ {FormatStyle.SHORT, FormatStyle.SHORT, MinguoChronology.INSTANCE, Locale.CHINESE, "Gyy/M/d ah:mm"},
+ {FormatStyle.FULL, null, MinguoChronology.INSTANCE, Locale.CHINESE, "Gy\u5e74M\u6708d\u65e5EEEE"},
+ {FormatStyle.LONG, null, MinguoChronology.INSTANCE, Locale.CHINESE, "Gy\u5e74M\u6708d\u65e5"},
+ {FormatStyle.MEDIUM, null, MinguoChronology.INSTANCE, Locale.CHINESE, "Gy\u5e74M\u6708d\u65e5"},
+ {FormatStyle.SHORT, null, MinguoChronology.INSTANCE, Locale.CHINESE, "Gyy/M/d"},
+ {null, FormatStyle.FULL, MinguoChronology.INSTANCE, Locale.CHINESE, "zzzz ah:mm:ss"},
+ {null, FormatStyle.LONG, MinguoChronology.INSTANCE, Locale.CHINESE, "z ah:mm:ss"},
+ {null, FormatStyle.MEDIUM, MinguoChronology.INSTANCE, Locale.CHINESE, "ah:mm:ss"},
+ {null, FormatStyle.SHORT, MinguoChronology.INSTANCE, Locale.CHINESE, "ah:mm"},
+ };
+ }
+
+ @Test(dataProvider="localePatterns")
+ public void test_getLocalizedDateTimePattern(FormatStyle dateStyle, FormatStyle timeStyle,
+ Chronology chrono, Locale locale, String expected) {
+ String actual = DateTimeFormatterBuilder.getLocalizedDateTimePattern(dateStyle, timeStyle, chrono, locale);
+ assertEquals(actual, expected, "Pattern " + convertNonAscii(actual));
+ }
+
+ /**
+ * Returns a string that includes non-ascii characters after expanding
+ * the non-ascii characters to their Java language \\uxxxx form.
+ * @param input an input string
+ * @return the encoded string.
+ */
+ private String convertNonAscii(String input) {
+ StringBuilder sb = new StringBuilder(input.length() * 6);
+ for (int i = 0; i < input.length(); i++) {
+ char ch = input.charAt(i);
+ if (ch < 255) {
+ sb.append(ch);
+ } else {
+ sb.append("\\u");
+ sb.append(Integer.toHexString(ch));
+ }
+ }
+ return sb.toString();
+ }
+
+ private static Temporal date(int y, int m, int d) {
+ return LocalDate.of(y, m, d);
+ }
+}
diff -r be8643ebe865 -r 6665640c56cf jdk/test/java/time/test/java/time/format/TestDateTimeTextProvider.java
--- a/jdk/test/java/time/test/java/time/format/TestDateTimeTextProvider.java Fri Jan 13 01:36:02 2017 +0000
+++ b/jdk/test/java/time/test/java/time/format/TestDateTimeTextProvider.java Wed Jul 05 22:41:30 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -80,7 +80,6 @@
public class TestDateTimeTextProvider extends AbstractTestPrinterParser {
Locale enUS = new Locale("en", "US");
- Locale ptBR = new Locale("pt", "BR");
//-----------------------------------------------------------------------
@DataProvider(name = "Text")
@@ -94,14 +93,6 @@
{DAY_OF_WEEK, 6, TextStyle.SHORT, enUS, "Sat"},
{DAY_OF_WEEK, 7, TextStyle.SHORT, enUS, "Sun"},
- {DAY_OF_WEEK, 1, TextStyle.SHORT, ptBR, "seg"},
- {DAY_OF_WEEK, 2, TextStyle.SHORT, ptBR, "ter"},
- {DAY_OF_WEEK, 3, TextStyle.SHORT, ptBR, "qua"},
- {DAY_OF_WEEK, 4, TextStyle.SHORT, ptBR, "qui"},
- {DAY_OF_WEEK, 5, TextStyle.SHORT, ptBR, "sex"},
- {DAY_OF_WEEK, 6, TextStyle.SHORT, ptBR, "s\u00E1b"},
- {DAY_OF_WEEK, 7, TextStyle.SHORT, ptBR, "dom"},
-
{DAY_OF_WEEK, 1, TextStyle.FULL, enUS, "Monday"},
{DAY_OF_WEEK, 2, TextStyle.FULL, enUS, "Tuesday"},
{DAY_OF_WEEK, 3, TextStyle.FULL, enUS, "Wednesday"},
@@ -110,14 +101,6 @@
{DAY_OF_WEEK, 6, TextStyle.FULL, enUS, "Saturday"},
{DAY_OF_WEEK, 7, TextStyle.FULL, enUS, "Sunday"},
- {DAY_OF_WEEK, 1, TextStyle.FULL, ptBR, "segunda-feira"},
- {DAY_OF_WEEK, 2, TextStyle.FULL, ptBR, "ter\u00E7a-feira"},
- {DAY_OF_WEEK, 3, TextStyle.FULL, ptBR, "quarta-feira"},
- {DAY_OF_WEEK, 4, TextStyle.FULL, ptBR, "quinta-feira"},
- {DAY_OF_WEEK, 5, TextStyle.FULL, ptBR, "sexta-feira"},
- {DAY_OF_WEEK, 6, TextStyle.FULL, ptBR, "s\u00E1bado"},
- {DAY_OF_WEEK, 7, TextStyle.FULL, ptBR, "domingo"},
-
{MONTH_OF_YEAR, 1, TextStyle.SHORT, enUS, "Jan"},
{MONTH_OF_YEAR, 2, TextStyle.SHORT, enUS, "Feb"},
{MONTH_OF_YEAR, 3, TextStyle.SHORT, enUS, "Mar"},
@@ -131,19 +114,6 @@
{MONTH_OF_YEAR, 11, TextStyle.SHORT, enUS, "Nov"},
{MONTH_OF_YEAR, 12, TextStyle.SHORT, enUS, "Dec"},
- {MONTH_OF_YEAR, 1, TextStyle.SHORT, ptBR, "jan"},
- {MONTH_OF_YEAR, 2, TextStyle.SHORT, ptBR, "fev"},
- {MONTH_OF_YEAR, 3, TextStyle.SHORT, ptBR, "mar"},
- {MONTH_OF_YEAR, 4, TextStyle.SHORT, ptBR, "abr"},
- {MONTH_OF_YEAR, 5, TextStyle.SHORT, ptBR, "mai"},
- {MONTH_OF_YEAR, 6, TextStyle.SHORT, ptBR, "jun"},
- {MONTH_OF_YEAR, 7, TextStyle.SHORT, ptBR, "jul"},
- {MONTH_OF_YEAR, 8, TextStyle.SHORT, ptBR, "ago"},
- {MONTH_OF_YEAR, 9, TextStyle.SHORT, ptBR, "set"},
- {MONTH_OF_YEAR, 10, TextStyle.SHORT, ptBR, "out"},
- {MONTH_OF_YEAR, 11, TextStyle.SHORT, ptBR, "nov"},
- {MONTH_OF_YEAR, 12, TextStyle.SHORT, ptBR, "dez"},
-
{MONTH_OF_YEAR, 1, TextStyle.FULL, enUS, "January"},
{MONTH_OF_YEAR, 2, TextStyle.FULL, enUS, "February"},
{MONTH_OF_YEAR, 3, TextStyle.FULL, enUS, "March"},
@@ -157,19 +127,6 @@
{MONTH_OF_YEAR, 11, TextStyle.FULL, enUS, "November"},
{MONTH_OF_YEAR, 12, TextStyle.FULL, enUS, "December"},
- {MONTH_OF_YEAR, 1, TextStyle.FULL, ptBR, "janeiro"},
- {MONTH_OF_YEAR, 2, TextStyle.FULL, ptBR, "fevereiro"},
- {MONTH_OF_YEAR, 3, TextStyle.FULL, ptBR, "mar\u00E7o"},
- {MONTH_OF_YEAR, 4, TextStyle.FULL, ptBR, "abril"},
- {MONTH_OF_YEAR, 5, TextStyle.FULL, ptBR, "maio"},
- {MONTH_OF_YEAR, 6, TextStyle.FULL, ptBR, "junho"},
- {MONTH_OF_YEAR, 7, TextStyle.FULL, ptBR, "julho"},
- {MONTH_OF_YEAR, 8, TextStyle.FULL, ptBR, "agosto"},
- {MONTH_OF_YEAR, 9, TextStyle.FULL, ptBR, "setembro"},
- {MONTH_OF_YEAR, 10, TextStyle.FULL, ptBR, "outubro"},
- {MONTH_OF_YEAR, 11, TextStyle.FULL, ptBR, "novembro"},
- {MONTH_OF_YEAR, 12, TextStyle.FULL, ptBR, "dezembro"},
-
{AMPM_OF_DAY, 0, TextStyle.SHORT, enUS, "AM"},
{AMPM_OF_DAY, 1, TextStyle.SHORT, enUS, "PM"},
diff -r be8643ebe865 -r 6665640c56cf jdk/test/java/time/test/java/time/format/TestDateTimeTextProviderWithLocale.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/time/test/java/time/format/TestDateTimeTextProviderWithLocale.java Wed Jul 05 22:41:30 2017 +0200
@@ -0,0 +1,146 @@
+/*
+ * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file:
+ *
+ * Copyright (c) 2011-2012, Stephen Colebourne & Michael Nascimento Santos
+ *
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * * Neither the name of JSR-310 nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/*
+ * @test
+ * @modules jdk.localedata
+ */
+
+package test.java.time.format;
+
+import static java.time.temporal.ChronoField.AMPM_OF_DAY;
+import static java.time.temporal.ChronoField.DAY_OF_WEEK;
+import static java.time.temporal.ChronoField.MONTH_OF_YEAR;
+import static org.testng.Assert.assertEquals;
+
+import java.time.ZonedDateTime;
+import java.time.format.DateTimeFormatter;
+import java.time.format.TextStyle;
+import java.time.temporal.TemporalField;
+import java.util.Locale;
+
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+
+/**
+ * Test SimpleDateTimeTextProviderWithLocale.
+ */
+@Test
+public class TestDateTimeTextProviderWithLocale extends AbstractTestPrinterParser {
+
+ Locale enUS = new Locale("en", "US");
+ Locale ptBR = new Locale("pt", "BR");
+
+ //-----------------------------------------------------------------------
+ @DataProvider(name = "Text")
+ Object[][] data_text() {
+ return new Object[][] {
+ {DAY_OF_WEEK, 1, TextStyle.SHORT, ptBR, "seg"},
+ {DAY_OF_WEEK, 2, TextStyle.SHORT, ptBR, "ter"},
+ {DAY_OF_WEEK, 3, TextStyle.SHORT, ptBR, "qua"},
+ {DAY_OF_WEEK, 4, TextStyle.SHORT, ptBR, "qui"},
+ {DAY_OF_WEEK, 5, TextStyle.SHORT, ptBR, "sex"},
+ {DAY_OF_WEEK, 6, TextStyle.SHORT, ptBR, "s\u00E1b"},
+ {DAY_OF_WEEK, 7, TextStyle.SHORT, ptBR, "dom"},
+
+ {DAY_OF_WEEK, 1, TextStyle.FULL, ptBR, "segunda-feira"},
+ {DAY_OF_WEEK, 2, TextStyle.FULL, ptBR, "ter\u00E7a-feira"},
+ {DAY_OF_WEEK, 3, TextStyle.FULL, ptBR, "quarta-feira"},
+ {DAY_OF_WEEK, 4, TextStyle.FULL, ptBR, "quinta-feira"},
+ {DAY_OF_WEEK, 5, TextStyle.FULL, ptBR, "sexta-feira"},
+ {DAY_OF_WEEK, 6, TextStyle.FULL, ptBR, "s\u00E1bado"},
+ {DAY_OF_WEEK, 7, TextStyle.FULL, ptBR, "domingo"},
+
+ {MONTH_OF_YEAR, 1, TextStyle.SHORT, ptBR, "jan"},
+ {MONTH_OF_YEAR, 2, TextStyle.SHORT, ptBR, "fev"},
+ {MONTH_OF_YEAR, 3, TextStyle.SHORT, ptBR, "mar"},
+ {MONTH_OF_YEAR, 4, TextStyle.SHORT, ptBR, "abr"},
+ {MONTH_OF_YEAR, 5, TextStyle.SHORT, ptBR, "mai"},
+ {MONTH_OF_YEAR, 6, TextStyle.SHORT, ptBR, "jun"},
+ {MONTH_OF_YEAR, 7, TextStyle.SHORT, ptBR, "jul"},
+ {MONTH_OF_YEAR, 8, TextStyle.SHORT, ptBR, "ago"},
+ {MONTH_OF_YEAR, 9, TextStyle.SHORT, ptBR, "set"},
+ {MONTH_OF_YEAR, 10, TextStyle.SHORT, ptBR, "out"},
+ {MONTH_OF_YEAR, 11, TextStyle.SHORT, ptBR, "nov"},
+ {MONTH_OF_YEAR, 12, TextStyle.SHORT, ptBR, "dez"},
+
+ {MONTH_OF_YEAR, 1, TextStyle.FULL, ptBR, "janeiro"},
+ {MONTH_OF_YEAR, 2, TextStyle.FULL, ptBR, "fevereiro"},
+ {MONTH_OF_YEAR, 3, TextStyle.FULL, ptBR, "mar\u00E7o"},
+ {MONTH_OF_YEAR, 4, TextStyle.FULL, ptBR, "abril"},
+ {MONTH_OF_YEAR, 5, TextStyle.FULL, ptBR, "maio"},
+ {MONTH_OF_YEAR, 6, TextStyle.FULL, ptBR, "junho"},
+ {MONTH_OF_YEAR, 7, TextStyle.FULL, ptBR, "julho"},
+ {MONTH_OF_YEAR, 8, TextStyle.FULL, ptBR, "agosto"},
+ {MONTH_OF_YEAR, 9, TextStyle.FULL, ptBR, "setembro"},
+ {MONTH_OF_YEAR, 10, TextStyle.FULL, ptBR, "outubro"},
+ {MONTH_OF_YEAR, 11, TextStyle.FULL, ptBR, "novembro"},
+ {MONTH_OF_YEAR, 12, TextStyle.FULL, ptBR, "dezembro"},
+
+ };
+ }
+
+ @Test(dataProvider = "Text")
+ public void test_getText(TemporalField field, Number value, TextStyle style, Locale locale, String expected) {
+ DateTimeFormatter fmt = getFormatter(field, style).withLocale(locale);
+ assertEquals(fmt.format(ZonedDateTime.now().with(field, value.longValue())), expected);
+ }
+
+}
diff -r be8643ebe865 -r 6665640c56cf jdk/test/java/time/test/java/time/format/TestNarrowMonthNamesAndDayNames.java
--- a/jdk/test/java/time/test/java/time/format/TestNarrowMonthNamesAndDayNames.java Fri Jan 13 01:36:02 2017 +0000
+++ b/jdk/test/java/time/test/java/time/format/TestNarrowMonthNamesAndDayNames.java Wed Jul 05 22:41:30 2017 +0200
@@ -20,13 +20,14 @@
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
-package test.java.time.format;
-
/*
* @test
+ * @modules jdk.localedata
* @bug 8146750
* @summary Test Narrow and NarrowStandalone month names are retrieved correctly.
*/
+package test.java.time.format;
+
import static org.testng.Assert.assertEquals;
import java.time.DayOfWeek;
diff -r be8643ebe865 -r 6665640c56cf jdk/test/java/time/test/java/time/format/TestNonIsoFormatter.java
--- a/jdk/test/java/time/test/java/time/format/TestNonIsoFormatter.java Fri Jan 13 01:36:02 2017 +0000
+++ b/jdk/test/java/time/test/java/time/format/TestNonIsoFormatter.java Wed Jul 05 22:41:30 2017 +0200
@@ -20,6 +20,13 @@
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
+
+/*
+ *
+ * @test
+ * @modules jdk.localedata
+ */
+
package test.java.time.format;
import static org.testng.Assert.assertEquals;
diff -r be8643ebe865 -r 6665640c56cf jdk/test/java/time/test/java/time/format/TestTextParser.java
--- a/jdk/test/java/time/test/java/time/format/TestTextParser.java Fri Jan 13 01:36:02 2017 +0000
+++ b/jdk/test/java/time/test/java/time/format/TestTextParser.java Wed Jul 05 22:41:30 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -68,16 +68,9 @@
import java.text.ParsePosition;
import java.time.DayOfWeek;
-import java.time.chrono.ChronoLocalDate;
-import java.time.chrono.JapaneseChronology;
-import java.time.chrono.HijrahDate;
-import java.time.chrono.JapaneseDate;
-import java.time.chrono.MinguoDate;
-import java.time.chrono.ThaiBuddhistDate;
import java.time.format.DateTimeFormatter;
import java.time.format.DateTimeFormatterBuilder;
import java.time.format.TextStyle;
-import java.time.format.SignStyle;
import java.time.temporal.TemporalAccessor;
import java.time.temporal.TemporalField;
import java.time.temporal.TemporalQueries;
@@ -92,8 +85,6 @@
*/
@Test
public class TestTextParser extends AbstractTestPrinterParser {
- static final Locale RUSSIAN = new Locale("ru");
- static final Locale FINNISH = new Locale("fi");
//-----------------------------------------------------------------------
@DataProvider(name="error")
@@ -213,20 +204,6 @@
};
}
- // Test data is dependent on localized resources.
- @DataProvider(name="parseStandaloneText")
- Object[][] providerStandaloneText() {
- // Locale, TemporalField, TextStyle, expected value, input text
- return new Object[][] {
- {RUSSIAN, MONTH_OF_YEAR, TextStyle.FULL_STANDALONE, 1, "\u044f\u043d\u0432\u0430\u0440\u044c"},
- {RUSSIAN, MONTH_OF_YEAR, TextStyle.FULL_STANDALONE, 12, "\u0434\u0435\u043a\u0430\u0431\u0440\u044c"},
- {RUSSIAN, MONTH_OF_YEAR, TextStyle.SHORT_STANDALONE, 1, "\u044f\u043d\u0432."},
- {RUSSIAN, MONTH_OF_YEAR, TextStyle.SHORT_STANDALONE, 12, "\u0434\u0435\u043a."},
- {FINNISH, DAY_OF_WEEK, TextStyle.FULL_STANDALONE, 2, "tiistai"},
- {FINNISH, DAY_OF_WEEK, TextStyle.SHORT_STANDALONE, 2, "ti"},
- };
- }
-
@DataProvider(name="parseDayOfWeekText")
Object[][] providerDayOfWeekData() {
return new Object[][] {
@@ -234,26 +211,9 @@
{Locale.US, "e", "1", DayOfWeek.SUNDAY},
{Locale.US, "ee", "01", DayOfWeek.SUNDAY},
{Locale.US, "c", "1", DayOfWeek.SUNDAY},
-
- {Locale.UK, "e", "1", DayOfWeek.MONDAY},
- {Locale.UK, "ee", "01", DayOfWeek.MONDAY},
- {Locale.UK, "c", "1", DayOfWeek.MONDAY},
};
}
- // Test data is dependent on localized resources.
- @DataProvider(name="parseLenientText")
- Object[][] providerLenientText() {
- // Locale, TemporalField, expected value, input text
- return new Object[][] {
- {RUSSIAN, MONTH_OF_YEAR, 1, "\u044f\u043d\u0432\u0430\u0440\u044f"}, // full format
- {RUSSIAN, MONTH_OF_YEAR, 1, "\u044f\u043d\u0432\u0430\u0440\u044c"}, // full standalone
- {RUSSIAN, MONTH_OF_YEAR, 1, "\u044f\u043d\u0432."}, // short format
- {RUSSIAN, MONTH_OF_YEAR, 1, "\u044f\u043d\u0432."}, // short standalone
- };
- }
-
-
@Test(dataProvider="parseText")
public void test_parseText(TemporalField field, TextStyle style, int value, String input) throws Exception {
@@ -269,14 +229,6 @@
assertEquals(pos.getIndex(), input.length());
}
- @Test(dataProvider="parseStandaloneText")
- public void test_parseStandaloneText(Locale locale, TemporalField field, TextStyle style, int expectedValue, String input) {
- DateTimeFormatter formatter = getFormatter(field, style).withLocale(locale);
- ParsePosition pos = new ParsePosition(0);
- assertEquals(formatter.parseUnresolved(input, pos).getLong(field), (long) expectedValue);
- assertEquals(pos.getIndex(), input.length());
- }
-
@Test(dataProvider="parseDayOfWeekText")
public void test_parseDayOfWeekText(Locale locale, String pattern, String input, DayOfWeek expected) {
DateTimeFormatter formatter = getPatternFormatter(pattern).withLocale(locale);
@@ -374,25 +326,6 @@
}
//-----------------------------------------------------------------------
- public void test_parse_french_short_strict_full_noMatch() throws Exception {
- setStrict(true);
- ParsePosition pos = new ParsePosition(0);
- getFormatter(MONTH_OF_YEAR, TextStyle.SHORT).withLocale(Locale.FRENCH)
- .parseUnresolved("janvier", pos);
- assertEquals(pos.getErrorIndex(), 0);
- }
-
- public void test_parse_french_short_strict_short_match() throws Exception {
- setStrict(true);
- ParsePosition pos = new ParsePosition(0);
- assertEquals(getFormatter(MONTH_OF_YEAR, TextStyle.SHORT).withLocale(Locale.FRENCH)
- .parseUnresolved("janv.", pos)
- .getLong(MONTH_OF_YEAR),
- 1L);
- assertEquals(pos.getIndex(), 5);
- }
-
- //-----------------------------------------------------------------------
public void test_parse_full_lenient_full_match() throws Exception {
setStrict(false);
ParsePosition pos = new ParsePosition(0);
@@ -436,51 +369,4 @@
assertEquals(pos.getIndex(), 1);
}
- @Test(dataProvider="parseLenientText")
- public void test_parseLenientText(Locale locale, TemporalField field, int expectedValue, String input) {
- setStrict(false);
- ParsePosition pos = new ParsePosition(0);
- DateTimeFormatter formatter = getFormatter(field).withLocale(locale);
- assertEquals(formatter.parseUnresolved(input, pos).getLong(field), (long) expectedValue);
- assertEquals(pos.getIndex(), input.length());
- }
-
- //-----------------------------------------------------------------------
- @DataProvider(name="parseChronoLocalDate")
- Object[][] provider_chronoLocalDate() {
- return new Object[][] {
- { HijrahDate.now() },
- { JapaneseDate.now() },
- { MinguoDate.now() },
- { ThaiBuddhistDate.now() }};
- }
-
- private static final DateTimeFormatter fmt_chrono =
- new DateTimeFormatterBuilder()
- .optionalStart()
- .appendChronologyId()
- .appendLiteral(' ')
- .optionalEnd()
- .optionalStart()
- .appendText(ChronoField.ERA, TextStyle.SHORT)
- .appendLiteral(' ')
- .optionalEnd()
- .appendValue(ChronoField.YEAR_OF_ERA, 1, 9, SignStyle.NORMAL)
- .appendLiteral('-')
- .appendValue(ChronoField.MONTH_OF_YEAR, 1, 2, SignStyle.NEVER)
- .appendLiteral('-')
- .appendValue(ChronoField.DAY_OF_MONTH, 1, 2, SignStyle.NEVER)
- .toFormatter();
-
- @Test(dataProvider="parseChronoLocalDate")
- public void test_chronoLocalDate(ChronoLocalDate date) throws Exception {
- System.out.printf(" %s, [fmt=%s]%n", date, fmt_chrono.format(date));
- assertEquals(date, fmt_chrono.parse(fmt_chrono.format(date), ChronoLocalDate::from));
-
- DateTimeFormatter fmt = DateTimeFormatter.ofPattern("[GGG ]yyy-MM-dd")
- .withChronology(date.getChronology());
- System.out.printf(" %s, [fmt=%s]%n", date.toString(), fmt.format(date));
- assertEquals(date, fmt.parse(fmt.format(date), ChronoLocalDate::from));
- }
-
}
diff -r be8643ebe865 -r 6665640c56cf jdk/test/java/time/test/java/time/format/TestTextParserWithLocale.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/time/test/java/time/format/TestTextParserWithLocale.java Wed Jul 05 22:41:30 2017 +0200
@@ -0,0 +1,226 @@
+/*
+ * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file:
+ *
+ * Copyright (c) 2008-2012, Stephen Colebourne & Michael Nascimento Santos
+ *
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * * Neither the name of JSR-310 nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/*
+ * @test
+ * @modules jdk.localedata
+ */
+
+package test.java.time.format;
+
+import java.text.ParsePosition;
+import java.time.chrono.ChronoLocalDate;
+import java.time.chrono.JapaneseChronology;
+import java.time.chrono.HijrahDate;
+import java.time.chrono.JapaneseDate;
+import java.time.chrono.MinguoDate;
+import java.time.chrono.ThaiBuddhistDate;
+import java.time.DayOfWeek;
+import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeFormatterBuilder;
+import java.time.format.TextStyle;
+import java.time.format.SignStyle;
+import java.time.temporal.ChronoField;
+import java.time.temporal.TemporalField;
+import java.util.Locale;
+
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+
+
+import static java.time.temporal.ChronoField.DAY_OF_MONTH;
+import static java.time.temporal.ChronoField.DAY_OF_WEEK;
+import static java.time.temporal.ChronoField.MONTH_OF_YEAR;
+import static org.testng.Assert.assertEquals;
+
+/**
+ * Test TextPrinterParser.
+ */
+@Test
+public class TestTextParserWithLocale extends AbstractTestPrinterParser {
+ static final Locale RUSSIAN = new Locale("ru");
+ static final Locale FINNISH = new Locale("fi");
+
+ @DataProvider(name="parseDayOfWeekText")
+ Object[][] providerDayOfWeekData() {
+ return new Object[][] {
+ // Locale, pattern, input text, expected DayOfWeek
+ {Locale.US, "e", "1", DayOfWeek.SUNDAY},
+ {Locale.US, "ee", "01", DayOfWeek.SUNDAY},
+ {Locale.US, "c", "1", DayOfWeek.SUNDAY},
+
+ {Locale.UK, "e", "1", DayOfWeek.MONDAY},
+ {Locale.UK, "ee", "01", DayOfWeek.MONDAY},
+ {Locale.UK, "c", "1", DayOfWeek.MONDAY},
+ };
+ }
+
+ @Test(dataProvider="parseDayOfWeekText")
+ public void test_parseDayOfWeekText(Locale locale, String pattern, String input, DayOfWeek expected) {
+ DateTimeFormatter formatter = getPatternFormatter(pattern).withLocale(locale);
+ ParsePosition pos = new ParsePosition(0);
+ assertEquals(DayOfWeek.from(formatter.parse(input, pos)), expected);
+ assertEquals(pos.getIndex(), input.length());
+ }
+
+ //--------------------------------------------------------------------
+ // Test data is dependent on localized resources.
+ @DataProvider(name="parseStandaloneText")
+ Object[][] providerStandaloneText() {
+ // Locale, TemporalField, TextStyle, expected value, input text
+ return new Object[][] {
+ {RUSSIAN, MONTH_OF_YEAR, TextStyle.FULL_STANDALONE, 1, "\u044f\u043d\u0432\u0430\u0440\u044c"},
+ {RUSSIAN, MONTH_OF_YEAR, TextStyle.FULL_STANDALONE, 12, "\u0434\u0435\u043a\u0430\u0431\u0440\u044c"},
+ {RUSSIAN, MONTH_OF_YEAR, TextStyle.SHORT_STANDALONE, 1, "\u044f\u043d\u0432."},
+ {RUSSIAN, MONTH_OF_YEAR, TextStyle.SHORT_STANDALONE, 12, "\u0434\u0435\u043a."},
+ {FINNISH, DAY_OF_WEEK, TextStyle.FULL_STANDALONE, 2, "tiistai"},
+ {FINNISH, DAY_OF_WEEK, TextStyle.SHORT_STANDALONE, 2, "ti"},
+ };
+ }
+
+ // Test data is dependent on localized resources.
+ @DataProvider(name="parseLenientText")
+ Object[][] providerLenientText() {
+ // Locale, TemporalField, expected value, input text
+ return new Object[][] {
+ {RUSSIAN, MONTH_OF_YEAR, 1, "\u044f\u043d\u0432\u0430\u0440\u044f"}, // full format
+ {RUSSIAN, MONTH_OF_YEAR, 1, "\u044f\u043d\u0432\u0430\u0440\u044c"}, // full standalone
+ {RUSSIAN, MONTH_OF_YEAR, 1, "\u044f\u043d\u0432."}, // short format
+ {RUSSIAN, MONTH_OF_YEAR, 1, "\u044f\u043d\u0432."}, // short standalone
+ };
+ }
+
+ @Test(dataProvider="parseStandaloneText")
+ public void test_parseStandaloneText(Locale locale, TemporalField field, TextStyle style, int expectedValue, String input) {
+ DateTimeFormatter formatter = getFormatter(field, style).withLocale(locale);
+ ParsePosition pos = new ParsePosition(0);
+ assertEquals(formatter.parseUnresolved(input, pos).getLong(field), (long) expectedValue);
+ assertEquals(pos.getIndex(), input.length());
+ }
+
+ //-----------------------------------------------------------------------
+ public void test_parse_french_short_strict_full_noMatch() throws Exception {
+ setStrict(true);
+ ParsePosition pos = new ParsePosition(0);
+ getFormatter(MONTH_OF_YEAR, TextStyle.SHORT).withLocale(Locale.FRENCH)
+ .parseUnresolved("janvier", pos);
+ assertEquals(pos.getErrorIndex(), 0);
+ }
+
+ public void test_parse_french_short_strict_short_match() throws Exception {
+ setStrict(true);
+ ParsePosition pos = new ParsePosition(0);
+ assertEquals(getFormatter(MONTH_OF_YEAR, TextStyle.SHORT).withLocale(Locale.FRENCH)
+ .parseUnresolved("janv.", pos)
+ .getLong(MONTH_OF_YEAR),
+ 1L);
+ assertEquals(pos.getIndex(), 5);
+ }
+
+ //-----------------------------------------------------------------------
+
+ @Test(dataProvider="parseLenientText")
+ public void test_parseLenientText(Locale locale, TemporalField field, int expectedValue, String input) {
+ setStrict(false);
+ ParsePosition pos = new ParsePosition(0);
+ DateTimeFormatter formatter = getFormatter(field).withLocale(locale);
+ assertEquals(formatter.parseUnresolved(input, pos).getLong(field), (long) expectedValue);
+ assertEquals(pos.getIndex(), input.length());
+ }
+
+
+ //-----------------------------------------------------------------------
+ @DataProvider(name="parseChronoLocalDate")
+ Object[][] provider_chronoLocalDate() {
+ return new Object[][] {
+ { HijrahDate.now() },
+ { JapaneseDate.now() },
+ { MinguoDate.now() },
+ { ThaiBuddhistDate.now() }};
+ }
+
+ private static final DateTimeFormatter fmt_chrono =
+ new DateTimeFormatterBuilder()
+ .optionalStart()
+ .appendChronologyId()
+ .appendLiteral(' ')
+ .optionalEnd()
+ .optionalStart()
+ .appendText(ChronoField.ERA, TextStyle.SHORT)
+ .appendLiteral(' ')
+ .optionalEnd()
+ .appendValue(ChronoField.YEAR_OF_ERA, 1, 9, SignStyle.NORMAL)
+ .appendLiteral('-')
+ .appendValue(ChronoField.MONTH_OF_YEAR, 1, 2, SignStyle.NEVER)
+ .appendLiteral('-')
+ .appendValue(ChronoField.DAY_OF_MONTH, 1, 2, SignStyle.NEVER)
+ .toFormatter();
+
+ @Test(dataProvider="parseChronoLocalDate")
+ public void test_chronoLocalDate(ChronoLocalDate date) throws Exception {
+ System.out.printf(" %s, [fmt=%s]%n", date, fmt_chrono.format(date));
+ assertEquals(date, fmt_chrono.parse(fmt_chrono.format(date), ChronoLocalDate::from));
+
+ DateTimeFormatter fmt = DateTimeFormatter.ofPattern("[GGG ]yyy-MM-dd")
+ .withChronology(date.getChronology());
+ System.out.printf(" %s, [fmt=%s]%n", date.toString(), fmt.format(date));
+ assertEquals(date, fmt.parse(fmt.format(date), ChronoLocalDate::from));
+ }
+}
diff -r be8643ebe865 -r 6665640c56cf jdk/test/java/time/test/java/time/format/TestTextPrinter.java
--- a/jdk/test/java/time/test/java/time/format/TestTextPrinter.java Fri Jan 13 01:36:02 2017 +0000
+++ b/jdk/test/java/time/test/java/time/format/TestTextPrinter.java Wed Jul 05 22:41:30 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -84,8 +84,6 @@
*/
@Test
public class TestTextPrinter extends AbstractTestPrinterParser {
- static final Locale RUSSIAN = new Locale("ru");
- static final Locale FINNISH = new Locale("fi");
//-----------------------------------------------------------------------
@Test(expectedExceptions=DateTimeException.class)
@@ -213,32 +211,6 @@
{Locale.US, "e", "1", DayOfWeek.SUNDAY},
{Locale.US, "ee", "01", DayOfWeek.SUNDAY},
{Locale.US, "c", "1", DayOfWeek.SUNDAY},
-
- {Locale.UK, "e", "1", DayOfWeek.MONDAY},
- {Locale.UK, "ee", "01", DayOfWeek.MONDAY},
- {Locale.UK, "c", "1", DayOfWeek.MONDAY},
- };
- }
-
- @DataProvider(name="print_JapaneseChronology")
- Object[][] provider_japaneseEra() {
- return new Object[][] {
- {ERA, TextStyle.FULL, 2, "Heisei"}, // Note: CLDR doesn't define "wide" Japanese era names.
- {ERA, TextStyle.SHORT, 2, "Heisei"},
- {ERA, TextStyle.NARROW, 2, "H"},
- };
- };
-
- // Test data is dependent on localized resources.
- @DataProvider(name="print_standalone")
- Object[][] provider_StandaloneNames() {
- return new Object[][] {
- // standalone names for 2013-01-01 (Tue)
- // Locale, TemporalField, TextStyle, expected text
- {RUSSIAN, MONTH_OF_YEAR, TextStyle.FULL_STANDALONE, "\u044f\u043d\u0432\u0430\u0440\u044c"},
- {RUSSIAN, MONTH_OF_YEAR, TextStyle.SHORT_STANDALONE, "\u044f\u043d\u0432."},
- {FINNISH, DAY_OF_WEEK, TextStyle.FULL_STANDALONE, "tiistai"},
- {FINNISH, DAY_OF_WEEK, TextStyle.SHORT_STANDALONE, "ti"},
};
}
@@ -255,30 +227,6 @@
assertEquals(text, expected);
}
- @Test(dataProvider="print_JapaneseChronology")
- public void test_formatJapaneseEra(TemporalField field, TextStyle style, int value, String expected) throws Exception {
- LocalDate ld = LocalDate.of(2013, 1, 31);
- getFormatter(field, style).withChronology(JapaneseChronology.INSTANCE).formatTo(ld, buf);
- assertEquals(buf.toString(), expected);
- }
-
- @Test(dataProvider="print_standalone")
- public void test_standaloneNames(Locale locale, TemporalField field, TextStyle style, String expected) {
- getFormatter(field, style).withLocale(locale).formatTo(LocalDate.of(2013, 1, 1), buf);
- assertEquals(buf.toString(), expected);
- }
-
- //-----------------------------------------------------------------------
- public void test_print_french_long() throws Exception {
- getFormatter(MONTH_OF_YEAR, TextStyle.FULL).withLocale(Locale.FRENCH).formatTo(LocalDate.of(2012, 1, 1), buf);
- assertEquals(buf.toString(), "janvier");
- }
-
- public void test_print_french_short() throws Exception {
- getFormatter(MONTH_OF_YEAR, TextStyle.SHORT).withLocale(Locale.FRENCH).formatTo(LocalDate.of(2012, 1, 1), buf);
- assertEquals(buf.toString(), "janv.");
- }
-
//-----------------------------------------------------------------------
public void test_toString1() throws Exception {
assertEquals(getFormatter(MONTH_OF_YEAR, TextStyle.FULL).toString(), "Text(MonthOfYear)");
diff -r be8643ebe865 -r 6665640c56cf jdk/test/java/time/test/java/time/format/TestTextPrinterWithLocale.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/time/test/java/time/format/TestTextPrinterWithLocale.java Wed Jul 05 22:41:30 2017 +0200
@@ -0,0 +1,163 @@
+/*
+ * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file:
+ *
+ * Copyright (c) 2008-2012, Stephen Colebourne & Michael Nascimento Santos
+ *
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * * Neither the name of JSR-310 nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/*
+ * @test
+ * @modules jdk.localedata
+ */
+
+package test.java.time.format;
+
+import static java.time.temporal.ChronoField.DAY_OF_MONTH;
+import static java.time.temporal.ChronoField.DAY_OF_WEEK;
+import static java.time.temporal.ChronoField.ERA;
+import static java.time.temporal.ChronoField.MONTH_OF_YEAR;
+import static java.time.temporal.IsoFields.QUARTER_OF_YEAR;
+import static org.testng.Assert.assertEquals;
+
+import java.time.DateTimeException;
+import java.time.DayOfWeek;
+import java.time.LocalDate;
+import java.time.chrono.JapaneseChronology;
+import java.time.format.DateTimeFormatter;
+import java.time.format.TextStyle;
+import java.time.temporal.TemporalField;
+import java.util.Locale;
+
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+import test.java.time.temporal.MockFieldValue;
+
+/**
+ * Test TextPrinterParserWithLocale.
+ */
+@Test
+public class TestTextPrinterWithLocale extends AbstractTestPrinterParser {
+ static final Locale RUSSIAN = new Locale("ru");
+ static final Locale FINNISH = new Locale("fi");
+
+ //-----------------------------------------------------------------------
+ @DataProvider(name="print_DayOfWeekData")
+ Object[][] providerDayOfWeekData() {
+ return new Object[][] {
+ // Locale, pattern, expected text, input DayOfWeek
+ {Locale.US, "e", "1", DayOfWeek.SUNDAY},
+ {Locale.US, "ee", "01", DayOfWeek.SUNDAY},
+ {Locale.US, "c", "1", DayOfWeek.SUNDAY},
+
+ {Locale.UK, "e", "1", DayOfWeek.MONDAY},
+ {Locale.UK, "ee", "01", DayOfWeek.MONDAY},
+ {Locale.UK, "c", "1", DayOfWeek.MONDAY},
+ };
+ }
+
+ // Test data is dependent on localized resources.
+ @DataProvider(name="print_standalone")
+ Object[][] provider_StandaloneNames() {
+ return new Object[][] {
+ // standalone names for 2013-01-01 (Tue)
+ // Locale, TemporalField, TextStyle, expected text
+ {RUSSIAN, MONTH_OF_YEAR, TextStyle.FULL_STANDALONE, "\u044f\u043d\u0432\u0430\u0440\u044c"},
+ {RUSSIAN, MONTH_OF_YEAR, TextStyle.SHORT_STANDALONE, "\u044f\u043d\u0432."},
+ {FINNISH, DAY_OF_WEEK, TextStyle.FULL_STANDALONE, "tiistai"},
+ {FINNISH, DAY_OF_WEEK, TextStyle.SHORT_STANDALONE, "ti"},
+ };
+ }
+
+ @Test(dataProvider="print_DayOfWeekData")
+ public void test_formatDayOfWeek(Locale locale, String pattern, String expected, DayOfWeek dayOfWeek) {
+ DateTimeFormatter formatter = getPatternFormatter(pattern).withLocale(locale);
+ String text = formatter.format(dayOfWeek);
+ assertEquals(text, expected);
+ }
+
+ @Test(dataProvider="print_standalone")
+ public void test_standaloneNames(Locale locale, TemporalField field, TextStyle style, String expected) {
+ getFormatter(field, style).withLocale(locale).formatTo(LocalDate.of(2013, 1, 1), buf);
+ assertEquals(buf.toString(), expected);
+ }
+
+ //-----------------------------------------------------------------------
+ public void test_print_french_long() throws Exception {
+ getFormatter(MONTH_OF_YEAR, TextStyle.FULL).withLocale(Locale.FRENCH).formatTo(LocalDate.of(2012, 1, 1), buf);
+ assertEquals(buf.toString(), "janvier");
+ }
+
+ public void test_print_french_short() throws Exception {
+ getFormatter(MONTH_OF_YEAR, TextStyle.SHORT).withLocale(Locale.FRENCH).formatTo(LocalDate.of(2012, 1, 1), buf);
+ assertEquals(buf.toString(), "janv.");
+ }
+
+ @DataProvider(name="print_JapaneseChronology")
+ Object[][] provider_japaneseEra() {
+ return new Object[][] {
+ {ERA, TextStyle.FULL, 2, "Heisei"}, // Note: CLDR doesn't define "wide" Japanese era names.
+ {ERA, TextStyle.SHORT, 2, "Heisei"},
+ {ERA, TextStyle.NARROW, 2, "H"},
+ };
+ };
+
+ @Test(dataProvider="print_JapaneseChronology")
+ public void test_formatJapaneseEra(TemporalField field, TextStyle style, int value, String expected) throws Exception {
+ LocalDate ld = LocalDate.of(2013, 1, 31);
+ getFormatter(field, style).withChronology(JapaneseChronology.INSTANCE).formatTo(ld, buf);
+ assertEquals(buf.toString(), expected);
+ }
+}
diff -r be8643ebe865 -r 6665640c56cf jdk/test/java/util/Collection/SetFactories.java
--- a/jdk/test/java/util/Collection/SetFactories.java Fri Jan 13 01:36:02 2017 +0000
+++ b/jdk/test/java/util/Collection/SetFactories.java Wed Jul 05 22:41:30 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 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
@@ -103,6 +103,8 @@
hashSetOf("a", "b", "c", "d", "e", "f", "g", "h", "i")),
a( Set.of("a", "b", "c", "d", "e", "f", "g", "h", "i", "j"),
hashSetOf("a", "b", "c", "d", "e", "f", "g", "h", "i", "j")),
+ a( Set.of("a", "b", "c", "d", "e", "f", "g", "h", "i", "j"),
+ Set.of("j", "i", "h", "g", "f", "e", "d", "c", "b", "a")),
a( Set.of(stringArray),
hashSetOf(stringArray))
).iterator();
@@ -183,6 +185,17 @@
Set set = Set.of(array);
}
+ @Test(dataProvider="all")
+ public void hashCodeEqual(Set act, Set exp) {
+ assertEquals(act.hashCode(), exp.hashCode());
+ }
+
+ @Test(dataProvider="all")
+ public void containsAll(Set act, Set exp) {
+ assertTrue(act.containsAll(exp));
+ assertTrue(exp.containsAll(act));
+ }
+
@Test(expectedExceptions=NullPointerException.class)
public void nullDisallowed1() {
Set.of((String)null); // force one-arg overload
diff -r be8643ebe865 -r 6665640c56cf jdk/test/java/util/Map/MapFactories.java
--- a/jdk/test/java/util/Map/MapFactories.java Fri Jan 13 01:36:02 2017 +0000
+++ b/jdk/test/java/util/Map/MapFactories.java Wed Jul 05 22:41:30 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 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
@@ -103,6 +103,8 @@
a(Map.of(0, "a", 1, "b", 2, "c", 3, "d", 4, "e", 5, "f", 6, "g", 7, "h"), genMap(8)),
a(Map.of(0, "a", 1, "b", 2, "c", 3, "d", 4, "e", 5, "f", 6, "g", 7, "h", 8, "i"), genMap(9)),
a(Map.of(0, "a", 1, "b", 2, "c", 3, "d", 4, "e", 5, "f", 6, "g", 7, "h", 8, "i", 9, "j"), genMap(10)),
+ a(Map.of(0, "a", 1, "b", 2, "c", 3, "d", 4, "e", 5, "f", 6, "g", 7, "h", 8, "i", 9, "j"),
+ Map.of(4, "e", 5, "f", 6, "g", 7, "h", 8, "i", 9, "j", 0, "a", 1, "b", 2, "c", 3, "d")),
a(Map.ofEntries(genEntries(MAX_ENTRIES)), genMap(MAX_ENTRIES))
).iterator();
}
@@ -135,6 +137,18 @@
assertEquals(act, exp);
}
+ @Test(dataProvider="all")
+ public void containsAllKeys(Map act, Map exp) {
+ assertTrue(act.keySet().containsAll(exp.keySet()));
+ assertTrue(exp.keySet().containsAll(act.keySet()));
+ }
+
+ @Test(dataProvider="all")
+ public void containsAllValues(Map act, Map exp) {
+ assertTrue(act.values().containsAll(exp.values()));
+ assertTrue(exp.values().containsAll(act.values()));
+ }
+
@Test(expectedExceptions=IllegalArgumentException.class)
public void dupKeysDisallowed2() {
Map map = Map.of(0, "a", 0, "b");
@@ -192,6 +206,11 @@
Map map = Map.ofEntries(entries);
}
+ @Test(dataProvider="all")
+ public void hashCodeEquals(Map act, Map exp) {
+ assertEquals(act.hashCode(), exp.hashCode());
+ }
+
@Test(expectedExceptions=NullPointerException.class)
public void nullKeyDisallowed1() {
Map map = Map.of(null, "a");
diff -r be8643ebe865 -r 6665640c56cf jdk/test/javax/swing/JTable/8133919/DrawGridLinesTest.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/javax/swing/JTable/8133919/DrawGridLinesTest.java Wed Jul 05 22:41:30 2017 +0200
@@ -0,0 +1,103 @@
+/*
+ * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * 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.
+ */
+import java.awt.Color;
+import java.awt.Graphics2D;
+import java.awt.image.BufferedImage;
+import javax.swing.JTable;
+import javax.swing.SwingUtilities;
+import javax.swing.table.AbstractTableModel;
+import javax.swing.table.DefaultTableCellRenderer;
+import javax.swing.table.TableModel;
+
+/*
+ * @test
+ * @bug 8133919
+ * @summary [macosx] JTable grid lines are incorrectly positioned on HiDPI display
+ * @run main DrawGridLinesTest
+ */
+public class DrawGridLinesTest {
+
+ private static final int WIDTH = 300;
+ private static final int HEIGHT = 150;
+ private static final Color GRID_COLOR = Color.BLACK;
+ private static final Color TABLE_BACKGROUND_COLOR = Color.BLUE;
+ private static final Color CELL_RENDERER_BACKGROUND_COLOR = Color.YELLOW;
+ private static final int SCALE = 2;
+
+ public static void main(String[] args) throws Exception {
+ SwingUtilities.invokeAndWait(DrawGridLinesTest::checkTableGridLines);
+ }
+
+ private static void checkTableGridLines() {
+
+ TableModel dataModel = new AbstractTableModel() {
+ public int getColumnCount() {
+ return 10;
+ }
+
+ public int getRowCount() {
+ return 10;
+ }
+
+ public Object getValueAt(int row, int col) {
+ return " ";
+ }
+ };
+
+ DefaultTableCellRenderer r = new DefaultTableCellRenderer();
+ r.setOpaque(true);
+ r.setBackground(CELL_RENDERER_BACKGROUND_COLOR);
+
+ JTable table = new JTable(dataModel);
+ table.setSize(WIDTH, HEIGHT);
+ table.setDefaultRenderer(Object.class, r);
+ table.setGridColor(GRID_COLOR);
+ table.setShowGrid(true);
+ table.setShowHorizontalLines(true);
+ table.setShowVerticalLines(true);
+ table.setBackground(TABLE_BACKGROUND_COLOR);
+
+ checkTableGridLines(table);
+ }
+
+ private static void checkTableGridLines(JTable table) {
+
+ int w = SCALE * WIDTH;
+ int h = SCALE * HEIGHT;
+
+ BufferedImage img = new BufferedImage(w, h, BufferedImage.TYPE_INT_RGB);
+ Graphics2D g = img.createGraphics();
+ g.scale(SCALE, SCALE);
+ table.paint(g);
+ g.dispose();
+
+ int size = Math.min(w, h);
+ int rgb = TABLE_BACKGROUND_COLOR.getRGB();
+
+ for (int i = 0; i < size; i++) {
+ if (img.getRGB(i, i) == rgb || img.getRGB(i, size - i - 1) == rgb) {
+ throw new RuntimeException("Artifacts in the table background color!");
+ }
+ }
+ }
+}
diff -r be8643ebe865 -r 6665640c56cf jdk/test/javax/swing/JTable/PrintManualTest_FitWidthMultiple.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/javax/swing/JTable/PrintManualTest_FitWidthMultiple.java Wed Jul 05 22:41:30 2017 +0200
@@ -0,0 +1,218 @@
+/*
+ * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * 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.
+ */
+/*
+ * @test
+ * @bug 8170349
+ * @summary Verify if printed content is within border and all columns are
+ * printed for PrintMode.FIT_WIDTH
+ * @run main/manual PrintManualTest_FitWidthMultiple
+ */
+
+import java.awt.BorderLayout;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
+import java.text.MessageFormat;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+import javax.print.attribute.HashPrintRequestAttributeSet;
+import javax.print.attribute.PrintRequestAttributeSet;
+import javax.swing.AbstractAction;
+import javax.swing.JButton;
+import javax.swing.JComponent;
+import javax.swing.JFrame;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.JTable;
+import javax.swing.JTextArea;
+import javax.swing.KeyStroke;
+import javax.swing.SwingUtilities;
+import javax.swing.table.AbstractTableModel;
+import javax.swing.table.TableModel;
+
+public class PrintManualTest_FitWidthMultiple extends JTable implements Runnable {
+
+ static boolean testPassed;
+ static JFrame fr = null;
+ static JFrame instructFrame = null;
+ private final CountDownLatch latch;
+
+ public PrintManualTest_FitWidthMultiple(CountDownLatch latch){
+ this.latch = latch;
+ }
+
+ @Override
+ public void run() {
+ try {
+ createUIandTest();
+ } catch (Exception ex) {
+ dispose();
+ latch.countDown();
+ throw new RuntimeException(ex.getMessage());
+ }
+ }
+
+ private void createUIandTest() throws Exception {
+ /*Message Format Header and Footer */
+ final MessageFormat header=new MessageFormat("JTable Printing Header {0}");
+ final MessageFormat footer = new MessageFormat("JTable Printing Footer {0}");
+
+ SwingUtilities.invokeAndWait(new Runnable() {
+ @Override
+ public void run() {
+ /* Instructions Section */
+ String info =
+ " \nThis test case brings up JTable with more Columns and Rows \n"+
+ "Press the Print Button. It Prints in PRINT_MODE_FIT_WIDTH \n" +
+ "It Pops up the Print Dialog. Check if Job/Print Attributes in the\n" +
+ "Print Dialog are configurable. Default Print out will be in Landscape \n"+
+ "The Print out should have JTable Centered on the Print out with thin borders \n"+
+ "Prints out with Header and Footer. \n"+
+ "The JTable should have all columns printed within border";
+
+ instructFrame=new JFrame("PrintManualTest_NormalSingle");
+ JPanel panel=new JPanel(new BorderLayout());
+ JButton button1 = new JButton("Pass");
+ JButton button2 = new JButton("Fail");
+ button1.addActionListener((e) -> {
+ testPassed = true;
+ dispose();
+ latch.countDown();
+ });
+ button2.addActionListener((e) -> {
+ testPassed = false;
+ dispose();
+ latch.countDown();
+ });
+ JPanel btnpanel1 = new JPanel();
+ btnpanel1.add(button1);
+ btnpanel1.add(button2);
+ panel.add(addInfo(info),BorderLayout.CENTER);
+ panel.add(btnpanel1, BorderLayout.SOUTH);
+ instructFrame.getContentPane().add(panel);
+ instructFrame.setBounds(600,100,350,350);
+
+ /* Print Button */
+ final JButton printButton=new JButton("Print");
+
+ /* Table Model */
+ final TableModel datamodel=new AbstractTableModel(){
+ @Override
+ public int getColumnCount() { return 50;}
+ @Override
+ public int getRowCount() { return 50; }
+ @Override
+ public Object getValueAt(int row, int column){ return new Integer(row*column);}
+ };
+
+ /* Constructing the JTable */
+ final JTable table=new JTable(datamodel);
+
+ /* Putting the JTable in ScrollPane and Frame Container */
+ JScrollPane scrollpane=new JScrollPane(table);
+ fr = new JFrame("PrintManualTest_FitWidthMultiple");
+ fr.getContentPane().add(scrollpane);
+
+ /* Light Weight Panel for holding Print and other buttons */
+ JPanel btnpanel=new JPanel();
+ btnpanel.add(printButton);
+ fr.getContentPane().add(btnpanel,BorderLayout.SOUTH);
+ fr.setBounds(0,0,400,400);
+ fr.setSize(500,500);
+
+ /* Binding the KeyStroke to Print Button Action */
+ fr.getRootPane().getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(KeyStroke.getKeyStroke("ctrl P"), "printButton");
+ fr.getRootPane().getActionMap().put("printButton", new AbstractAction(){
+ @Override
+ public void actionPerformed(ActionEvent e){
+ printButton.doClick();
+ }
+ });
+
+ /* Container and Component Listeners */
+ fr.addWindowListener(new WindowAdapter() {
+ @Override
+ public void windowClosing(WindowEvent e) {
+ dispose();
+ if (testPassed == false) {
+ throw new RuntimeException(" User has not executed the test");
+ }
+ }
+ });
+
+ final PrintRequestAttributeSet prattr=new HashPrintRequestAttributeSet();
+ prattr.add(javax.print.attribute.standard.OrientationRequested.LANDSCAPE);
+
+ printButton.addActionListener(new ActionListener(){
+ @Override
+ public void actionPerformed(ActionEvent ae){
+ try{
+ table.print(JTable.PrintMode.FIT_WIDTH, header,footer,true,prattr,true);
+ } catch(Exception e){}
+ }
+ });
+ instructFrame.setVisible(true);
+ fr.setVisible(true);
+ }
+ });
+ }
+
+ public void dispose() {
+ instructFrame.dispose();
+ fr.dispose();
+ }
+
+ public JScrollPane addInfo(String info) {
+ JTextArea jta = new JTextArea(info,8,20);
+ jta.setEditable(false);
+ jta.setLineWrap(true);
+ JScrollPane sp = new JScrollPane(jta);
+ return sp;
+
+ }
+
+ /* Main Method */
+
+ public static void main(String[] argv) throws Exception {
+ final CountDownLatch latch = new CountDownLatch(1);
+ PrintManualTest_FitWidthMultiple test = new PrintManualTest_FitWidthMultiple(latch);
+ Thread T1 = new Thread(test);
+ T1.start();
+
+ // wait for latch to complete
+ boolean ret = false;
+ try {
+ ret = latch.await(60, TimeUnit.SECONDS);
+ } catch (InterruptedException ie) {
+ throw ie;
+ }
+ if (!ret) {
+ test.dispose();
+ throw new RuntimeException(" User has not executed the test");
+ }
+ if (test.testPassed == false) {
+ throw new RuntimeException("printed contents is beyond borders");
+ }
+ }
+}
diff -r be8643ebe865 -r 6665640c56cf jdk/test/javax/swing/text/View/8156217/FPMethodCalledTest.java
--- a/jdk/test/javax/swing/text/View/8156217/FPMethodCalledTest.java Fri Jan 13 01:36:02 2017 +0000
+++ b/jdk/test/javax/swing/text/View/8156217/FPMethodCalledTest.java Wed Jul 05 22:41:30 2017 +0200
@@ -42,7 +42,7 @@
/**
* @test
- * @bug 8156217
+ * @bug 8156217 8169922
* @key headful
* @summary Selected text is shifted on HiDPI display
* @run main FPMethodCalledTest
diff -r be8643ebe865 -r 6665640c56cf jdk/test/javax/xml/ws/8159058/SaajEmptyNamespaceTest.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/javax/xml/ws/8159058/SaajEmptyNamespaceTest.java Wed Jul 05 22:41:30 2017 +0200
@@ -0,0 +1,284 @@
+/*
+ * Copyright (c) 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.
+ *
+ * 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.
+ */
+
+/*
+ * @test
+ * @bug 8159058
+ * @summary Test that empty default namespace declaration clears the
+ * default namespace value
+ * @modules java.xml.ws/com.sun.xml.internal.ws.api
+ * java.xml.ws/com.sun.xml.internal.ws.api.message.saaj
+ * java.xml.ws/com.sun.xml.internal.ws.message.stream
+ * @run testng/othervm SaajEmptyNamespaceTest
+ */
+
+import com.sun.xml.internal.ws.api.SOAPVersion;
+import com.sun.xml.internal.ws.api.message.saaj.SAAJFactory;
+import com.sun.xml.internal.ws.message.stream.StreamMessage;
+import java.io.ByteArrayInputStream;
+import java.io.StringReader;
+import java.io.StringWriter;
+import java.io.UnsupportedEncodingException;
+import javax.xml.namespace.QName;
+import javax.xml.soap.MessageFactory;
+import javax.xml.soap.SOAPBody;
+import javax.xml.soap.SOAPElement;
+import javax.xml.soap.SOAPException;
+import javax.xml.soap.SOAPMessage;
+import javax.xml.stream.XMLInputFactory;
+import javax.xml.stream.XMLStreamReader;
+import javax.xml.transform.OutputKeys;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
+import javax.xml.transform.stream.StreamSource;
+import org.testng.Assert;
+import org.testng.annotations.Test;
+import org.w3c.dom.Node;
+
+public class SaajEmptyNamespaceTest {
+
+ /*
+ * Test that SOAP message with default namespace declaration that contains empty
+ * string is properly processed by SAAJ reader.
+ */
+ @Test
+ public void testResetDefaultNamespaceSAAJ() throws Exception {
+ // Create SOAP message from XML string and process it with SAAJ reader
+ XMLStreamReader envelope = XMLInputFactory.newFactory().createXMLStreamReader(
+ new StringReader(INPUT_SOAP_MESSAGE));
+ StreamMessage streamMessage = new StreamMessage(SOAPVersion.SOAP_11,
+ envelope, null);
+ SAAJFactory saajFact = new SAAJFactory();
+ SOAPMessage soapMessage = saajFact.readAsSOAPMessage(SOAPVersion.SOAP_11, streamMessage);
+
+ // Check if constructed object model meets local names and namespace expectations
+ SOAPElement request = (SOAPElement) soapMessage.getSOAPBody().getFirstChild();
+ // Check top body element name
+ Assert.assertEquals(request.getLocalName(), "SampleServiceRequest");
+ // Check top body element namespace
+ Assert.assertEquals(request.getNamespaceURI(), TEST_NS);
+ SOAPElement params = (SOAPElement) request.getFirstChild();
+ // Check first child name
+ Assert.assertEquals(params.getLocalName(), "RequestParams");
+ // Check if first child namespace is null
+ Assert.assertNull(params.getNamespaceURI());
+
+ // Check inner elements of the first child
+ SOAPElement param1 = (SOAPElement) params.getFirstChild();
+ Assert.assertEquals(param1.getLocalName(), "Param1");
+ Assert.assertNull(param1.getNamespaceURI());
+ SOAPElement param2 = (SOAPElement) params.getChildNodes().item(1);
+ Assert.assertEquals(param2.getLocalName(), "Param2");
+ Assert.assertNull(param2.getNamespaceURI());
+ // Check full content of SOAP body
+ Assert.assertEquals(nodeToText(request), EXPECTED_RESULT);
+ }
+
+ /*
+ * Test that adding element with explicitly null namespace URI shall put the
+ * element into global namespace. Namespace declarations are not added explicitly.
+ */
+ @Test
+ public void testAddElementToNullNsNoDeclarations() throws Exception {
+ // Create empty SOAP message
+ SOAPMessage msg = createSoapMessage();
+ SOAPBody body = msg.getSOAPPart().getEnvelope().getBody();
+
+ // Add elements
+ SOAPElement parentExplicitNS = body.addChildElement("content", "", TEST_NS);
+ SOAPElement childGlobalNS = parentExplicitNS.addChildElement("global-child", "", null);
+ SOAPElement childDefaultNS = parentExplicitNS.addChildElement("default-child");
+
+ // Check namespace URIs
+ Assert.assertNull(childGlobalNS.getNamespaceURI());
+ Assert.assertEquals(childDefaultNS.getNamespaceURI(), TEST_NS);
+ }
+
+ /*
+ * Test that adding element with explicitly empty namespace URI shall put
+ * the element into global namespace. Namespace declarations are not added
+ * explicitly.
+ */
+ @Test
+ public void testAddElementToGlobalNsNoDeclarations() throws Exception {
+ // Create empty SOAP message
+ SOAPMessage msg = createSoapMessage();
+ SOAPBody body = msg.getSOAPPart().getEnvelope().getBody();
+
+ // Add elements
+ SOAPElement parentExplicitNS = body.addChildElement("content", "", TEST_NS);
+ SOAPElement childGlobalNS = parentExplicitNS.addChildElement("global-child", "", "");
+ SOAPElement childDefaultNS = parentExplicitNS.addChildElement("default-child");
+
+ // Check namespace URIs
+ Assert.assertNull(childGlobalNS.getNamespaceURI());
+ Assert.assertEquals(childDefaultNS.getNamespaceURI(), TEST_NS);
+ }
+
+ /*
+ * Test that adding element with explicitly empty namespace URI set via QName
+ * shall put the element into global namespace.
+ */
+ @Test
+ public void testAddElementToNullNsQName() throws Exception {
+ // Create empty SOAP message
+ SOAPMessage msg = createSoapMessage();
+ SOAPBody body = msg.getSOAPPart().getEnvelope().getBody();
+
+ // Add elements
+ SOAPElement parentExplicitNS = body.addChildElement("content", "", TEST_NS);
+ parentExplicitNS.addNamespaceDeclaration("", TEST_NS);
+ SOAPElement childGlobalNS = parentExplicitNS.addChildElement(new QName(null, "global-child"));
+ childGlobalNS.addNamespaceDeclaration("", "");
+ SOAPElement grandChildGlobalNS = childGlobalNS.addChildElement("global-grand-child");
+ SOAPElement childDefaultNS = parentExplicitNS.addChildElement("default-child");
+
+ // Check namespace URIs
+ Assert.assertNull(childGlobalNS.getNamespaceURI());
+ Assert.assertNull(grandChildGlobalNS.getNamespaceURI());
+ Assert.assertEquals(childDefaultNS.getNamespaceURI(), TEST_NS);
+ }
+
+ /*
+ * Test that adding element with explicitly empty namespace URI shall put
+ * the element into global namespace.
+ */
+ @Test
+ public void testAddElementToGlobalNs() throws Exception {
+ // Create empty SOAP message
+ SOAPMessage msg = createSoapMessage();
+ SOAPBody body = msg.getSOAPPart().getEnvelope().getBody();
+
+ // Add elements
+ SOAPElement parentExplicitNS = body.addChildElement("content", "", TEST_NS);
+ parentExplicitNS.addNamespaceDeclaration("", TEST_NS);
+ SOAPElement childGlobalNS = parentExplicitNS.addChildElement("global-child", "", "");
+ childGlobalNS.addNamespaceDeclaration("", "");
+ SOAPElement grandChildGlobalNS = childGlobalNS.addChildElement("global-grand-child");
+ SOAPElement childDefaultNS = parentExplicitNS.addChildElement("default-child");
+
+ // Check namespace URIs
+ Assert.assertNull(childGlobalNS.getNamespaceURI());
+ Assert.assertNull(grandChildGlobalNS.getNamespaceURI());
+ Assert.assertEquals(childDefaultNS.getNamespaceURI(), TEST_NS);
+ }
+
+ /*
+ * Test that adding element with explicitly null namespace URI shall put
+ * the element into global namespace.
+ */
+ @Test
+ public void testAddElementToNullNs() throws Exception {
+ // Create empty SOAP message
+ SOAPMessage msg = createSoapMessage();
+ SOAPBody body = msg.getSOAPPart().getEnvelope().getBody();
+
+ // Add elements
+ SOAPElement parentExplicitNS = body.addChildElement("content", "", TEST_NS);
+ parentExplicitNS.addNamespaceDeclaration("", TEST_NS);
+ SOAPElement childGlobalNS = parentExplicitNS.addChildElement("global-child", "", null);
+ childGlobalNS.addNamespaceDeclaration("", null);
+ SOAPElement grandChildGlobalNS = childGlobalNS.addChildElement("global-grand-child");
+ SOAPElement childDefaultNS = parentExplicitNS.addChildElement("default-child");
+
+ // Check namespace URIs
+ Assert.assertNull(childGlobalNS.getNamespaceURI());
+ Assert.assertNull(grandChildGlobalNS.getNamespaceURI());
+ Assert.assertEquals(TEST_NS, childDefaultNS.getNamespaceURI());
+ }
+
+ /*
+ * Test that adding element with explicitly empty namespace URI via QName
+ * shall put the element in global namespace.
+ */
+ @Test
+ public void testAddElementToGlobalNsQName() throws Exception {
+ // Create empty SOAP message
+ SOAPMessage msg = createSoapMessage();
+ SOAPBody body = msg.getSOAPPart().getEnvelope().getBody();
+
+ // Add elements
+ SOAPElement parentExplicitNS = body.addChildElement("content", "", TEST_NS);
+ parentExplicitNS.addNamespaceDeclaration("", TEST_NS);
+ SOAPElement childGlobalNS = parentExplicitNS.addChildElement(new QName("", "global-child"));
+ childGlobalNS.addNamespaceDeclaration("", "");
+ SOAPElement grandChildGlobalNS = childGlobalNS.addChildElement("global-grand-child");
+ SOAPElement childDefaultNS = parentExplicitNS.addChildElement("default-child");
+
+ // Check namespace URIs
+ Assert.assertNull(childGlobalNS.getNamespaceURI());
+ Assert.assertNull(grandChildGlobalNS.getNamespaceURI());
+ Assert.assertEquals(childDefaultNS.getNamespaceURI(),TEST_NS);
+ }
+
+ // Convert DOM node to text representation
+ private String nodeToText(Node node) throws TransformerException {
+ Transformer trans = TransformerFactory.newInstance().newTransformer();
+ trans.setOutputProperty(OutputKeys.OMIT_XML_DECLARATION, "yes");
+ StringWriter writer = new StringWriter();
+ StreamResult result = new StreamResult(writer);
+ trans.transform(new DOMSource(node), result);
+ String bodyContent = writer.toString();
+ System.out.println("SOAP body content read by SAAJ:"+bodyContent);
+ return bodyContent;
+ }
+
+ // Create SOAP message with empty body
+ private static SOAPMessage createSoapMessage() throws SOAPException, UnsupportedEncodingException {
+ String xml = ""
+ +"";
+ MessageFactory mFactory = MessageFactory.newInstance();
+ SOAPMessage msg = mFactory.createMessage();
+ msg.getSOAPPart().setContent(new StreamSource(new ByteArrayInputStream(xml.getBytes("utf-8"))));
+ return msg;
+ }
+
+ // Namespace value used in tests
+ private static String TEST_NS = "http://example.org/test";
+
+ // Content of SOAP message passed to SAAJ factory
+ private static String INPUT_SOAP_MESSAGE = ""
+ + ""
+ + ""
+ + ""
+ + "