Automatic merge of jdk:master into master

Author: duke

src/jdk.jlink/share/classes/jdk/tools/jlink/internal/ImagePluginStack.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2021, 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
@@ -282,7 +282,7 @@ public ResourcePool visitResources(ResourcePoolManager resources)
      * This pool wrap the original pool and automatically uncompress ResourcePoolEntry
      * if needed.
      */
-    private class LastPoolManager extends ResourcePoolManager {
+    private static class LastPoolManager extends ResourcePoolManager {
         private class LastModule implements ResourcePoolModule {
 
             final ResourcePoolModule module;

src/jdk.jlink/share/classes/jdk/tools/jlink/internal/ResourcePoolManager.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2021, 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
@@ -74,7 +74,7 @@ public static boolean isNamedPackageResource(String path) {
                 Resources.canEncapsulate(path);
     }
 
-    class ResourcePoolModuleImpl implements ResourcePoolModule {
+    static class ResourcePoolModuleImpl implements ResourcePoolModule {
 
         final Map<String, ResourcePoolEntry> moduleContent = new LinkedHashMap<>();
         // lazily initialized

src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/SystemModulesPlugin.java

@@ -477,7 +477,7 @@ InputStream getInputStream() {
             return bais;
         }
 
-        class ModuleInfoRewriter extends ByteArrayOutputStream {
+        static class ModuleInfoRewriter extends ByteArrayOutputStream {
             final ModuleInfoExtender extender;
             ModuleInfoRewriter(InputStream in) {
                 this.extender = ModuleInfoExtender.newExtender(in);
@@ -625,7 +625,7 @@ public ClassWriter getClassWriter(Configuration cf) {
         }
 
         /**
-         * Generate byteccode for no-arg constructor
+         * Generate bytecode for no-arg constructor
          */
         private void genConstructor(ClassWriter cw) {
             MethodVisitor mv = cw.visitMethod(ACC_PUBLIC, "<init>", "()V", null, null);