From 21df412bd9a02f0c3f351467951415141d920e03 Mon Sep 17 00:00:00 2001
From: Andrey Turbanov <turbanoff@gmail.com>
Date: Thu, 14 Oct 2021 23:12:05 +0000
Subject: [PATCH] 8275240: Change nested classes in jdk.attach to static nested
 classes

Reviewed-by: cjplummer, dholmes, sspitsyn
---
 .../aix/classes/sun/tools/attach/VirtualMachineImpl.java    | 2 +-
 .../linux/classes/sun/tools/attach/VirtualMachineImpl.java  | 2 +-
 .../macosx/classes/sun/tools/attach/VirtualMachineImpl.java | 2 +-
 .../classes/sun/tools/attach/VirtualMachineImpl.java        | 6 ++----
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/jdk.attach/aix/classes/sun/tools/attach/VirtualMachineImpl.java b/src/jdk.attach/aix/classes/sun/tools/attach/VirtualMachineImpl.java
index 75cc0fbb476..78450b8053e 100644
--- a/src/jdk.attach/aix/classes/sun/tools/attach/VirtualMachineImpl.java
+++ b/src/jdk.attach/aix/classes/sun/tools/attach/VirtualMachineImpl.java
@@ -233,7 +233,7 @@ public class VirtualMachineImpl extends HotSpotVirtualMachine {
     /*
      * InputStream for the socket connection to get target VM
      */
-    private class SocketInputStream extends InputStream {
+    private static class SocketInputStream extends InputStream {
         int s;
 
         public SocketInputStream(int s) {
diff --git a/src/jdk.attach/linux/classes/sun/tools/attach/VirtualMachineImpl.java b/src/jdk.attach/linux/classes/sun/tools/attach/VirtualMachineImpl.java
index e2fad3c06e2..402cc10b67b 100644
--- a/src/jdk.attach/linux/classes/sun/tools/attach/VirtualMachineImpl.java
+++ b/src/jdk.attach/linux/classes/sun/tools/attach/VirtualMachineImpl.java
@@ -237,7 +237,7 @@ public class VirtualMachineImpl extends HotSpotVirtualMachine {
     /*
      * InputStream for the socket connection to get target VM
      */
-    private class SocketInputStream extends InputStream {
+    private static class SocketInputStream extends InputStream {
         int s = -1;
 
         public SocketInputStream(int s) {
diff --git a/src/jdk.attach/macosx/classes/sun/tools/attach/VirtualMachineImpl.java b/src/jdk.attach/macosx/classes/sun/tools/attach/VirtualMachineImpl.java
index 9c9e0b7494e..e484ddd1bc0 100644
--- a/src/jdk.attach/macosx/classes/sun/tools/attach/VirtualMachineImpl.java
+++ b/src/jdk.attach/macosx/classes/sun/tools/attach/VirtualMachineImpl.java
@@ -233,7 +233,7 @@ public class VirtualMachineImpl extends HotSpotVirtualMachine {
     /*
      * InputStream for the socket connection to get target VM
      */
-    private class SocketInputStream extends InputStream {
+    private static class SocketInputStream extends InputStream {
         int s;
 
         public SocketInputStream(int s) {
diff --git a/src/jdk.attach/windows/classes/sun/tools/attach/VirtualMachineImpl.java b/src/jdk.attach/windows/classes/sun/tools/attach/VirtualMachineImpl.java
index 27b3f5c8eb6..1277e1fd123 100644
--- a/src/jdk.attach/windows/classes/sun/tools/attach/VirtualMachineImpl.java
+++ b/src/jdk.attach/windows/classes/sun/tools/attach/VirtualMachineImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 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
@@ -29,8 +29,6 @@ import com.sun.tools.attach.AgentLoadException;
 import com.sun.tools.attach.AttachNotSupportedException;
 import com.sun.tools.attach.spi.AttachProvider;
 
-import sun.tools.attach.HotSpotVirtualMachine;
-
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.Random;
@@ -141,7 +139,7 @@ public class VirtualMachineImpl extends HotSpotVirtualMachine {
     }
 
     // An InputStream based on a pipe to the target VM
-    private class PipedInputStream extends InputStream {
+    private static class PipedInputStream extends InputStream {
 
         private long hPipe;