# HG changeset patch # User igerasim # Date 1509593082 25200 # Wed Nov 01 20:24:42 2017 -0700 # Node ID df5d7407ff48cb1633d92842d58b33fea5b82968 # Parent 4a35a00eb00106dc24412ab578ec58da120c5589 [mq]: XXXXXXX-double-trouble-2 diff --git a/src/java.base/share/classes/java/lang/ModuleLayer.java b/src/java.base/share/classes/java/lang/ModuleLayer.java --- a/src/java.base/share/classes/java/lang/ModuleLayer.java +++ b/src/java.base/share/classes/java/lang/ModuleLayer.java @@ -766,7 +766,7 @@ /** - * Returns an ordered stream of layers. The first element is is this layer, + * Returns an ordered stream of layers. The first element is this layer, * the remaining elements are the parent layers in DFS order. * * @implNote For now, the assumption is that the number of elements will diff --git a/src/java.base/share/classes/java/lang/StackTraceElement.java b/src/java.base/share/classes/java/lang/StackTraceElement.java --- a/src/java.base/share/classes/java/lang/StackTraceElement.java +++ b/src/java.base/share/classes/java/lang/StackTraceElement.java @@ -293,7 +293,7 @@ *
  • * "{@code acme@2.1/org.acme.Lib.test(Lib.java:80)}" * - The class of the execution point is defined in {@code acme} module - * loaded by by a built-in class loader such as the application class loader. + * loaded by a built-in class loader such as the application class loader. *
    • *
  • * "{@code MyClass.mash(MyClass.java:9)}" diff --git a/src/java.base/share/classes/java/lang/module/ModuleDescriptor.java b/src/java.base/share/classes/java/lang/module/ModuleDescriptor.java --- a/src/java.base/share/classes/java/lang/module/ModuleDescriptor.java +++ b/src/java.base/share/classes/java/lang/module/ModuleDescriptor.java @@ -1593,7 +1593,7 @@ /** * Adds a dependence on a module with the given (and possibly empty) * set of modifiers. The dependence includes the version of the - * module that that was recorded at compile-time. + * module that was recorded at compile-time. * * @param ms * The set of modifiers 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 @@ -217,7 +217,7 @@ Resolver bind() { // Scan the finders for all available service provider modules. As - // java.base uses services then then module finders will be scanned + // java.base uses services then the module finders will be scanned // anyway. Map> availableProviders = new HashMap<>(); for (ModuleReference mref : findAll()) { diff --git a/src/java.base/share/classes/java/math/BigInteger.java b/src/java.base/share/classes/java/math/BigInteger.java --- a/src/java.base/share/classes/java/math/BigInteger.java +++ b/src/java.base/share/classes/java/math/BigInteger.java @@ -2741,7 +2741,7 @@ return z; } - // These methods are intended to be be replaced by virtual machine + // These methods are intended to be replaced by virtual machine // intrinsics. @HotSpotIntrinsicCandidate private static int[] implMontgomeryMultiply(int[] a, int[] b, int[] n, int len, diff --git a/src/java.base/share/classes/jdk/internal/loader/URLClassPath.java b/src/java.base/share/classes/jdk/internal/loader/URLClassPath.java --- a/src/java.base/share/classes/jdk/internal/loader/URLClassPath.java +++ b/src/java.base/share/classes/jdk/internal/loader/URLClassPath.java @@ -687,7 +687,7 @@ } /* - * Nested class class used to represent a Loader of resources from a JAR URL. + * Nested class used to represent a Loader of resources from a JAR URL. */ static class JarLoader extends Loader { private JarFile jar; diff --git a/src/java.base/share/classes/jdk/internal/misc/JavaLangAccess.java b/src/java.base/share/classes/jdk/internal/misc/JavaLangAccess.java --- a/src/java.base/share/classes/jdk/internal/misc/JavaLangAccess.java +++ b/src/java.base/share/classes/jdk/internal/misc/JavaLangAccess.java @@ -254,7 +254,7 @@ ServicesCatalog getServicesCatalog(ModuleLayer layer); /** - * Returns an ordered stream of layers. The first element is is the + * Returns an ordered stream of layers. The first element is the * given layer, the remaining elements are its parents, in DFS order. */ Stream layers(ModuleLayer layer); diff --git a/src/java.base/share/classes/jdk/internal/misc/Unsafe.java b/src/java.base/share/classes/jdk/internal/misc/Unsafe.java --- a/src/java.base/share/classes/jdk/internal/misc/Unsafe.java +++ b/src/java.base/share/classes/jdk/internal/misc/Unsafe.java @@ -572,7 +572,7 @@ checkPointer(o, offset); if (o != null) { - // If on heap, it it must be a primitive array + // If on heap, it must be a primitive array checkPrimitiveArray(o.getClass()); } } diff --git a/src/java.base/share/classes/jdk/internal/module/ModulePath.java b/src/java.base/share/classes/jdk/internal/module/ModulePath.java --- a/src/java.base/share/classes/jdk/internal/module/ModulePath.java +++ b/src/java.base/share/classes/jdk/internal/module/ModulePath.java @@ -112,7 +112,7 @@ } /** - * Returns a ModuleFinder that that locates modules on the file system by + * Returns a ModuleFinder that locates modules on the file system by * searching a sequence of directories and/or packaged modules. The modules * may be patched by the given ModulePatcher. */ @@ -121,7 +121,7 @@ } /** - * Returns a ModuleFinder that that locates modules on the file system by + * Returns a ModuleFinder that locates modules on the file system by * searching a sequence of directories and/or packaged modules. */ public static ModuleFinder of(Path... entries) { @@ -129,7 +129,7 @@ } /** - * Returns a ModuleFinder that that locates modules on the file system by + * Returns a ModuleFinder that locates modules on the file system by * searching a sequence of directories and/or packaged modules. * * @param version The release version to use for multi-release JAR files diff --git a/src/java.base/share/classes/jdk/internal/module/Modules.java b/src/java.base/share/classes/jdk/internal/module/Modules.java --- a/src/java.base/share/classes/jdk/internal/module/Modules.java +++ b/src/java.base/share/classes/jdk/internal/module/Modules.java @@ -65,7 +65,7 @@ * Creates a new Module. The module has the given ModuleDescriptor and * is defined to the given class loader. * - * The resulting Module is in a larval state in that it does not not read + * The resulting Module is in a larval state in that it does not read * any other module and does not have any exports. * * The URI is for information purposes only. diff --git a/src/java.base/share/classes/jdk/internal/module/SystemModulesMap.java b/src/java.base/share/classes/jdk/internal/module/SystemModulesMap.java --- a/src/java.base/share/classes/jdk/internal/module/SystemModulesMap.java +++ b/src/java.base/share/classes/jdk/internal/module/SystemModulesMap.java @@ -59,7 +59,7 @@ } /** - * Returns the array of of SystemModules class names. The elements + * Returns the array of SystemModules class names. The elements * correspond to the elements in the array returned by moduleNames(). */ static String[] classNames() { diff --git a/src/java.base/share/classes/sun/net/idn/StringPrep.java b/src/java.base/share/classes/sun/net/idn/StringPrep.java --- a/src/java.base/share/classes/sun/net/idn/StringPrep.java +++ b/src/java.base/share/classes/sun/net/idn/StringPrep.java @@ -212,7 +212,7 @@ //indexes[INDEX_MAPPING_DATA_SIZE] store the size of mappingData in bytes mappingData = new char[indexes[INDEX_MAPPING_DATA_SIZE]/2]; - // load the rest of the data data and initialize the data members + // load the rest of the data and initialize the data members reader.read(sprepBytes,mappingData); sprepTrieImpl = new StringPrepTrieImpl(); diff --git a/src/java.base/share/classes/sun/net/www/MimeEntry.java b/src/java.base/share/classes/sun/net/www/MimeEntry.java --- a/src/java.base/share/classes/sun/net/www/MimeEntry.java +++ b/src/java.base/share/classes/sun/net/www/MimeEntry.java @@ -252,7 +252,7 @@ } case UNKNOWN: - // REMIND: What do do here? + // REMIND: What to do here? return null; } diff --git a/src/java.base/share/classes/sun/security/provider/certpath/PolicyNodeImpl.java b/src/java.base/share/classes/sun/security/provider/certpath/PolicyNodeImpl.java --- a/src/java.base/share/classes/sun/security/provider/certpath/PolicyNodeImpl.java +++ b/src/java.base/share/classes/sun/security/provider/certpath/PolicyNodeImpl.java @@ -306,7 +306,7 @@ } /** - * Add all nodes at depth depth to set and return the Set. + * Add all nodes at depth to set and return the Set. * Internal recursion helper. */ private void getPolicyNodes(int depth, Set set) { diff --git a/src/java.base/share/classes/sun/security/x509/PrivateKeyUsageExtension.java b/src/java.base/share/classes/sun/security/x509/PrivateKeyUsageExtension.java --- a/src/java.base/share/classes/sun/security/x509/PrivateKeyUsageExtension.java +++ b/src/java.base/share/classes/sun/security/x509/PrivateKeyUsageExtension.java @@ -195,7 +195,7 @@ } /** - * Verify that that the current time is within the validity period. + * Verify that the current time is within the validity period. * * @exception CertificateExpiredException if the certificate has expired. * @exception CertificateNotYetValidException if the certificate is not @@ -208,7 +208,7 @@ } /** - * Verify that that the passed time is within the validity period. + * Verify that the passed time is within the validity period. * * @exception CertificateExpiredException if the certificate has expired * with respect to the Date supplied. diff --git a/src/java.base/solaris/native/libjvm_dtrace/jvm_dtrace.c b/src/java.base/solaris/native/libjvm_dtrace/jvm_dtrace.c --- a/src/java.base/solaris/native/libjvm_dtrace/jvm_dtrace.c +++ b/src/java.base/solaris/native/libjvm_dtrace/jvm_dtrace.c @@ -422,7 +422,7 @@ print_debug("door_call failed\n"); } else { /* - * door_call succeeded but the call didn't return the the expected jint. + * door_call succeeded but the call didn't return the expected jint. */ if (door_args.data_size < sizeof(int)) { print_debug("Enqueue error - reason unknown as result is truncated!");