Merge

src/java.base/share/classes/java/lang/ClassLoader.java

@@ -2166,7 +2166,7 @@ public abstract class ClassLoader {
      * @spec JPMS
      *
      * @jvms 5.3 Run-time package
-     * @see <a href="{@docRoot}/../specs/jar/jar.html#sealing">
+     * @see <a href="{@docRoot}/../specs/jar/jar.html#package-sealing">
      *      The JAR File Specification: Package Sealing</a>
      */
     protected Package definePackage(String name, String specTitle,

src/java.base/share/classes/java/lang/Package.java

@@ -109,7 +109,7 @@ import jdk.internal.reflect.Reflection;
  * and have no specification and implementation versioning information.
  *
  * @jvms 5.3 Run-time package
- * @see <a href="{@docRoot}/../specs/jar/jar.html#sealing">
+ * @see <a href="{@docRoot}/../specs/jar/jar.html#package-sealing">
  * The JAR File Specification: Package Sealing</a>
  * @see ClassLoader#definePackage(String, String, String, String, String, String, String, URL)
  *

src/java.base/share/classes/java/lang/String.java

@@ -2664,6 +2664,7 @@ public final class String
      * point</a> is passed through uninterpreted.
      *
      * @return an IntStream of char values from this sequence
+     * @since 9
      */
     @Override
     public IntStream chars() {
@@ -2683,6 +2684,7 @@ public final class String
      * {@code int} values which are then passed to the stream.
      *
      * @return an IntStream of Unicode code points from this sequence
+     * @since 9
      */
     @Override
     public IntStream codePoints() {

src/java.base/share/classes/java/lang/WeakPairMap.java

@@ -88,7 +88,7 @@ final class WeakPairMap<K1, K2, V> {
      * Maps the specified key pair to the specified value in this WeakPairMap.
      * Neither the keys nor the value can be null.
      * <p>The value can be retrieved by calling the {@link #get} method
-     * with the the same keys (compared by identity).
+     * with the same keys (compared by identity).
      *
      * @param k1 the 1st of the pair of keys with which the specified value is to
      *           be associated

src/java.base/share/classes/java/lang/invoke/MethodHandleImpl.java

@@ -1196,7 +1196,7 @@ import static jdk.internal.org.objectweb.asm.Opcodes.*;
 
         static
         MethodHandle bindCaller(MethodHandle mh, Class<?> hostClass) {
-            // Code in the the boot layer should now be careful while creating method handles or
+            // Code in the boot layer should now be careful while creating method handles or
             // functional interface instances created from method references to @CallerSensitive  methods,
             // it needs to be ensured the handles or interface instances are kept safe and are not passed
             // from the boot layer to untrusted code.

src/java.base/share/classes/java/lang/invoke/StringConcatFactory.java

@@ -195,7 +195,7 @@ public final class StringConcatFactory {
         // In case we need to double-back onto the StringConcatFactory during this
         // static initialization, make sure we have the reasonable defaults to complete
         // the static initialization properly. After that, actual users would use the
-        // the proper values we have read from the the properties.
+        // the proper values we have read from the properties.
         STRATEGY = DEFAULT_STRATEGY;
         // CACHE_ENABLE = false; // implied
         // CACHE = null;         // implied
@@ -398,8 +398,8 @@ public final class StringConcatFactory {
      * <p>Then the following linkage invariants must hold:
      *
      * <ul>
-     *     <li>The parameter count in {@code concatType} is less than or equal to 200</li>
-     *
+     *     <li>The number of parameter slots in {@code concatType} is
+     *         less than or equal to 200</li>
      *     <li>The return type in {@code concatType} is assignable from {@link java.lang.String}</li>
      * </ul>
      *
@@ -487,8 +487,8 @@ public final class StringConcatFactory {
      * <p>Then the following linkage invariants must hold:
      *
      * <ul>
-     *   <li>The parameter count in {@code concatType} is less than or equal to
-     *   200</li>
+     *   <li>The number of parameter slots in {@code concatType} is less than
+     *       or equal to 200</li>
      *
      *   <li>The parameter count in {@code concatType} equals to number of \1 tags
      *   in {@code recipe}</li>
@@ -613,9 +613,9 @@ public final class StringConcatFactory {
                             concatType.returnType());
         }
 
-        if (concatType.parameterCount() > MAX_INDY_CONCAT_ARG_SLOTS) {
+        if (concatType.parameterSlotCount() > MAX_INDY_CONCAT_ARG_SLOTS) {
             throw new StringConcatException("Too many concat argument slots: " +
-                    concatType.parameterCount() +
+                    concatType.parameterSlotCount() +
                     ", can only accept " +
                     MAX_INDY_CONCAT_ARG_SLOTS);
         }