# HG changeset patch # User prappo # Date 1548807872 0 # Wed Jan 30 00:24:32 2019 +0000 # Node ID bd5612b0230babc871eebb7727202c0024a3f221 # Parent 1ae0b76bb5df6320e237adb4cfe1a1c738c84cbf 8218022: Repeated words typos in java.base Reviewed-by: alanb, lancea Contributed-by: Andrey Turbanov diff --git a/src/java.base/share/classes/java/lang/LiveStackFrame.java b/src/java.base/share/classes/java/lang/LiveStackFrame.java --- a/src/java.base/share/classes/java/lang/LiveStackFrame.java +++ b/src/java.base/share/classes/java/lang/LiveStackFrame.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2019, 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 @@ -166,7 +166,7 @@ * @param options stack walk {@link StackWalker.Option options} * * @throws SecurityException if the security manager is present and - * it denies access to {@code RuntimePermission("liveStackFrames")}; or + * it denies access to {@code RuntimePermission("liveStackFrames")}; * or if the given {@code options} contains * {@link StackWalker.Option#RETAIN_CLASS_REFERENCE Option.RETAIN_CLASS_REFERENCE} * and it denies access to {@code RuntimePermission("getStackWalkerWithClassReference")}. diff --git a/src/java.base/share/classes/java/lang/Object.java b/src/java.base/share/classes/java/lang/Object.java --- a/src/java.base/share/classes/java/lang/Object.java +++ b/src/java.base/share/classes/java/lang/Object.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1994, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1994, 2019, 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 @@ -430,7 +430,7 @@ * } * * @param timeoutMillis the maximum time to wait, in milliseconds - * @param nanos additional time, in nanoseconds, in the range range 0-999999 inclusive + * @param nanos additional time, in nanoseconds, in the range 0-999999 inclusive * @throws IllegalArgumentException if {@code timeoutMillis} is negative, * or if the value of {@code nanos} is out of range * @throws IllegalMonitorStateException if the current thread is not diff --git a/src/java.base/share/classes/java/lang/String.java b/src/java.base/share/classes/java/lang/String.java --- a/src/java.base/share/classes/java/lang/String.java +++ b/src/java.base/share/classes/java/lang/String.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1994, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1994, 2019, 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 @@ -2698,7 +2698,7 @@ *

* Otherwise, returns a substring of this string beginning with the first * code point that is not a {@link Character#isWhitespace(int) white space} - * up to to and including the last code point of this string. + * up to and including the last code point of this string. *

* This method may be used to trim * {@link Character#isWhitespace(int) white space} from diff --git a/src/java.base/share/classes/java/lang/invoke/MethodHandle.java b/src/java.base/share/classes/java/lang/invoke/MethodHandle.java --- a/src/java.base/share/classes/java/lang/invoke/MethodHandle.java +++ b/src/java.base/share/classes/java/lang/invoke/MethodHandle.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2019, 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 @@ -1083,7 +1083,7 @@ * else if (makeVarargs) * return asVarargsCollector(type().lastParameterType()); * else - * return return asFixedArity(); + * return asFixedArity(); * } * @param makeVarargs true if the return method handle should have variable arity behavior * @return a method handle of the same type, with possibly adjusted variable arity behavior diff --git a/src/java.base/share/classes/java/lang/invoke/MethodHandleNatives.java b/src/java.base/share/classes/java/lang/invoke/MethodHandleNatives.java --- a/src/java.base/share/classes/java/lang/invoke/MethodHandleNatives.java +++ b/src/java.base/share/classes/java/lang/invoke/MethodHandleNatives.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2019, 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 @@ -434,7 +434,7 @@ * completely in the linker method. * As a corner case, if N==255, no appendix is possible. * In this case, the method returned must be custom-generated to - * to perform any needed type checking. + * perform any needed type checking. *

* If the JVM does not reify a method at a call site, but instead * calls {@code linkMethod}, the corresponding call represented diff --git a/src/java.base/share/classes/java/lang/invoke/VarHandle.java b/src/java.base/share/classes/java/lang/invoke/VarHandle.java --- a/src/java.base/share/classes/java/lang/invoke/VarHandle.java +++ b/src/java.base/share/classes/java/lang/invoke/VarHandle.java @@ -2160,7 +2160,7 @@ * Construct a {@linkplain VarHandleDesc} given a kind, name, and declaring * class. * - * @param kind the kind of of the var handle + * @param kind the kind of the var handle * @param name the unqualified name of the field, for field var handles; otherwise ignored * @param declaringClass a {@link ClassDesc} describing the declaring class, * for field var handles @@ -2217,7 +2217,7 @@ /** * Returns a {@linkplain VarHandleDesc} corresponding to a {@link VarHandle} - * for for an array type. + * for an array type. * * @param arrayClass a {@link ClassDesc} describing the type of the array * @return the {@linkplain VarHandleDesc} diff --git a/src/java.base/share/classes/java/lang/module/Resolver.java b/src/java.base/share/classes/java/lang/module/Resolver.java --- a/src/java.base/share/classes/java/lang/module/Resolver.java +++ b/src/java.base/share/classes/java/lang/module/Resolver.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2019, 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 @@ -659,7 +659,7 @@ * Checks the readability graph to ensure that *

    *
  1. A module does not read two or more modules with the same name. - * This includes the case where a module reads another another with the + * This includes the case where a module reads another module with the * same name as itself.

  2. *
  3. Two or more modules in the configuration don't export the same * package to a module that reads both. This includes the case where a diff --git a/src/java.base/share/classes/java/security/cert/Extension.java b/src/java.base/share/classes/java/security/cert/Extension.java --- a/src/java.base/share/classes/java/security/cert/Extension.java +++ b/src/java.base/share/classes/java/security/cert/Extension.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2019, 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 @@ -41,7 +41,7 @@ *

    * Each extension contains an object identifier, a criticality setting * indicating whether it is a critical or a non-critical extension, and - * and an ASN.1 DER-encoded value. Its ASN.1 definition is: + * an ASN.1 DER-encoded value. Its ASN.1 definition is: * *

      *
    diff --git a/src/java.base/share/classes/java/util/SimpleTimeZone.java b/src/java.base/share/classes/java/util/SimpleTimeZone.java
    --- a/src/java.base/share/classes/java/util/SimpleTimeZone.java
    +++ b/src/java.base/share/classes/java/util/SimpleTimeZone.java
    @@ -1,5 +1,5 @@
     /*
    - * Copyright (c) 1996, 2017, Oracle and/or its affiliates. All rights reserved.
    + * Copyright (c) 1996, 2019, 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
    @@ -310,7 +310,7 @@
          *                        See the class description for the special cases of this parameter.
          * @param endDayOfWeek    The daylight saving time ending day-of-week.
          *                        See the class description for the special cases of this parameter.
    -     * @param endTime         The daylight saving ending time in time time mode
    +     * @param endTime         The daylight saving ending time in time mode
          *                        specified by endTimeMode.
          * @param endTimeMode     The mode of the end time specified by endTime
          * @param dstSavings      The amount of time in milliseconds saved during
    diff --git a/src/java.base/share/classes/java/util/stream/WhileOps.java b/src/java.base/share/classes/java/util/stream/WhileOps.java
    --- a/src/java.base/share/classes/java/util/stream/WhileOps.java
    +++ b/src/java.base/share/classes/java/util/stream/WhileOps.java
    @@ -1,5 +1,5 @@
     /*
    - * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
    + * Copyright (c) 2015, 2019, 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
    @@ -658,7 +658,7 @@
             // True if no splitting should be performed, if true then
             // this spliterator may be used for an underlying spliterator whose
             // covered elements have an encounter order
    -        // See use in stream take/dropWhile default default methods
    +        // See use in stream take/dropWhile default methods
             final boolean noSplitting;
             // True when operations are cancelled for all related spliterators
             // For taking, spliterators cannot split or traversed
    diff --git a/src/java.base/share/classes/javax/security/auth/SubjectDomainCombiner.java b/src/java.base/share/classes/javax/security/auth/SubjectDomainCombiner.java
    --- a/src/java.base/share/classes/javax/security/auth/SubjectDomainCombiner.java
    +++ b/src/java.base/share/classes/javax/security/auth/SubjectDomainCombiner.java
    @@ -1,5 +1,5 @@
     /*
    - * Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved.
    + * Copyright (c) 1999, 2019, 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
    @@ -57,7 +57,7 @@
          * {@code SubjectDomainCombiner}.
          *
          * @param subject the {@code Subject} to be associated with
    -     *          with this {@code SubjectDomainCombiner}.
    +     *          this {@code SubjectDomainCombiner}.
          */
         public SubjectDomainCombiner(Subject subject) {
             this.subject = subject;
    diff --git a/src/java.base/share/classes/javax/security/auth/callback/ConfirmationCallback.java b/src/java.base/share/classes/javax/security/auth/callback/ConfirmationCallback.java
    --- a/src/java.base/share/classes/javax/security/auth/callback/ConfirmationCallback.java
    +++ b/src/java.base/share/classes/javax/security/auth/callback/ConfirmationCallback.java
    @@ -1,5 +1,5 @@
     /*
    - * Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved.
    + * Copyright (c) 1999, 2019, 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,7 +58,7 @@
         public static final int YES_NO_OPTION               = 0;
     
         /**
    -     * YES/NO/CANCEL confirmation confirmation option.
    +     * YES/NO/CANCEL confirmation option.
          *
          * 

    An underlying security service specifies this as the * {@code optionType} to a {@code ConfirmationCallback} @@ -68,7 +68,7 @@ public static final int YES_NO_CANCEL_OPTION = 1; /** - * OK/CANCEL confirmation confirmation option. + * OK/CANCEL confirmation option. * *

    An underlying security service specifies this as the * {@code optionType} to a {@code ConfirmationCallback} diff --git a/src/java.base/share/classes/jdk/internal/access/SharedSecrets.java b/src/java.base/share/classes/jdk/internal/access/SharedSecrets.java --- a/src/java.base/share/classes/jdk/internal/access/SharedSecrets.java +++ b/src/java.base/share/classes/jdk/internal/access/SharedSecrets.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2019, 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 @@ -77,7 +77,7 @@ public static JavaUtilJarAccess javaUtilJarAccess() { if (javaUtilJarAccess == null) { - // Ensure JarFile is initialized; we know that that class + // Ensure JarFile is initialized; we know that this class // provides the shared secret unsafe.ensureClassInitialized(JarFile.class); } diff --git a/src/java.base/share/classes/jdk/internal/module/ServicesCatalog.java b/src/java.base/share/classes/jdk/internal/module/ServicesCatalog.java --- a/src/java.base/share/classes/jdk/internal/module/ServicesCatalog.java +++ b/src/java.base/share/classes/jdk/internal/module/ServicesCatalog.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2019, 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 @@ -86,7 +86,7 @@ private ServicesCatalog() { } /** - * Creates a ServicesCatalog that supports concurrent registration and + * Creates a ServicesCatalog that supports concurrent registration * and lookup */ public static ServicesCatalog create() { diff --git a/src/java.base/share/classes/jdk/internal/platform/Metrics.java b/src/java.base/share/classes/jdk/internal/platform/Metrics.java --- a/src/java.base/share/classes/jdk/internal/platform/Metrics.java +++ b/src/java.base/share/classes/jdk/internal/platform/Metrics.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2019, 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 @@ -278,7 +278,7 @@ * operating system tries to satisfy a memory request for any * process in the current Isolation Group when no free memory is * readily available. Use {@link #isCpuSetMemoryPressureEnabled()} to - * to determine if this support is enabled. + * determine if this support is enabled. * * @return Memory pressure or 0 if not enabled or metric is not * available. @@ -322,7 +322,7 @@ * Returns the largest amount of physical memory, in bytes, that * have been allocated in the Isolation Group. * - * @return The largest amount of memory in bytes or or 0 if this + * @return The largest amount of memory in bytes or 0 if this * metric is not available. * */ @@ -362,7 +362,7 @@ * Returns the largest amount of kernel physical memory, in bytes, that * have been allocated in the Isolation Group. * - * @return The largest amount of memory in bytes or or 0 if this + * @return The largest amount of memory in bytes or 0 if this * metric is not available. * */ @@ -402,7 +402,7 @@ * Returns the largest amount of networking physical memory, in bytes, * that have been allocated in the Isolation Group. * - * @return The largest amount of memory in bytes or or 0 if this + * @return The largest amount of memory in bytes or 0 if this * metric is not available. * */ @@ -442,7 +442,7 @@ * Returns the largest amount of physical memory and swap space, * in bytes, that have been allocated in the Isolation Group. * - * @return The largest amount of memory in bytes or or 0 if this + * @return The largest amount of memory in bytes or 0 if this * metric is not available. * */ diff --git a/src/java.base/share/classes/sun/net/www/http/HttpClient.java b/src/java.base/share/classes/sun/net/www/http/HttpClient.java --- a/src/java.base/share/classes/sun/net/www/http/HttpClient.java +++ b/src/java.base/share/classes/sun/net/www/http/HttpClient.java @@ -216,7 +216,7 @@ } /* This package-only CTOR should only be used for FTP piggy-backed on HTTP - * HTTP URL's that use this won't take advantage of keep-alive. + * URL's that use this won't take advantage of keep-alive. * Additionally, this constructor may be used as a last resort when the * first HttpClient gotten through New() failed (probably b/c of a * Keep-Alive mismatch). diff --git a/src/java.base/share/classes/sun/security/ssl/HandshakeHash.java b/src/java.base/share/classes/sun/security/ssl/HandshakeHash.java --- a/src/java.base/share/classes/sun/security/ssl/HandshakeHash.java +++ b/src/java.base/share/classes/sun/security/ssl/HandshakeHash.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2019, 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 @@ -246,7 +246,7 @@ try { baos.writeTo(result.baos); } catch (IOException ex) { - throw new RuntimeException("unable to to clone hash state"); + throw new RuntimeException("unable to clone hash state"); } return result; } diff --git a/src/java.base/share/classes/sun/security/ssl/RenegoInfoExtension.java b/src/java.base/share/classes/sun/security/ssl/RenegoInfoExtension.java --- a/src/java.base/share/classes/sun/security/ssl/RenegoInfoExtension.java +++ b/src/java.base/share/classes/sun/security/ssl/RenegoInfoExtension.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2019, 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 @@ -145,7 +145,7 @@ if (!chc.conContext.isNegotiated) { if (chc.activeCipherSuites.contains( CipherSuite.TLS_EMPTY_RENEGOTIATION_INFO_SCSV)) { - // Using the the TLS_EMPTY_RENEGOTIATION_INFO_SCSV instead. + // Using the TLS_EMPTY_RENEGOTIATION_INFO_SCSV instead. return null; } diff --git a/src/java.base/share/classes/sun/security/ssl/SSLTransport.java b/src/java.base/share/classes/sun/security/ssl/SSLTransport.java --- a/src/java.base/share/classes/sun/security/ssl/SSLTransport.java +++ b/src/java.base/share/classes/sun/security/ssl/SSLTransport.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2019, 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 @@ -71,7 +71,7 @@ * destination application data buffers. * * For SSL/TLS connections, if no source data, the network data may be - * received from the underlying underlying SSL/TLS input stream. + * received from the underlying SSL/TLS input stream. * * @param context the transportation context * @param srcs an array of {@code ByteBuffers} containing the diff --git a/src/java.base/share/classes/sun/security/ssl/TrustStoreManager.java b/src/java.base/share/classes/sun/security/ssl/TrustStoreManager.java --- a/src/java.base/share/classes/sun/security/ssl/TrustStoreManager.java +++ b/src/java.base/share/classes/sun/security/ssl/TrustStoreManager.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2019, 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 @@ -331,7 +331,7 @@ } /** - * Load the the KeyStore as described in the specified descriptor. + * Load the KeyStore as described in the specified descriptor. */ private static KeyStore loadKeyStore( TrustStoreDescriptor descriptor) throws Exception { diff --git a/src/java.base/share/classes/sun/security/util/ConstraintsParameters.java b/src/java.base/share/classes/sun/security/util/ConstraintsParameters.java --- a/src/java.base/share/classes/sun/security/util/ConstraintsParameters.java +++ b/src/java.base/share/classes/sun/security/util/ConstraintsParameters.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2019, 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 @@ -36,8 +36,8 @@ /** * This class contains parameters for checking against constraints that extend * past the publicly available parameters in java.security.AlgorithmConstraints. - - * This is currently on passed between between PKIX, AlgorithmChecker, + * + * This is currently passed between PKIX, AlgorithmChecker, * and DisabledAlgorithmConstraints. */ public class ConstraintsParameters { diff --git a/src/java.base/share/classes/sun/security/util/math/SmallValue.java b/src/java.base/share/classes/sun/security/util/math/SmallValue.java --- a/src/java.base/share/classes/sun/security/util/math/SmallValue.java +++ b/src/java.base/share/classes/sun/security/util/math/SmallValue.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -28,7 +28,7 @@ /** * A "small" value that can be used with the field arithmetic library. This * interface enables optimizations based on the fact that certain values are - * known to be small, where the definition of small is specific to the the + * known to be small, where the definition of small is specific to the * arithmetic implementation. */