src/java.base/share/classes/sun/nio/ch/NioSocketImpl.java

@@ -106,12 +106,12 @@
  
      // set to true when the socket is in non-blocking mode
      private volatile boolean nonBlocking;
  
      // used by connect/read/write/accept, protected by stateLock
-     private long readerThread;
-     private long writerThread;
+     private Thread readerThread;
+     private Thread writerThread;
  
      // used when SO_REUSEADDR is emulated, protected by stateLock
      private boolean isReuseAddress;
  
      // read or accept timeout in millis

@@ -221,22 +221,22 @@
       * @throws SocketException if the socket is closed or not connected
       */
      private FileDescriptor beginRead() throws SocketException {
          synchronized (stateLock) {
              ensureOpenAndConnected();
-             readerThread = NativeThread.current();
+             readerThread = NativeThread.threadToSignal();
              return fd;
          }
      }
  
      /**
       * Marks the end of a read operation that may have blocked.
       * @throws SocketException is the socket is closed
       */
      private void endRead(boolean completed) throws SocketException {
          synchronized (stateLock) {
-             readerThread = 0;
+             readerThread = null;
              int state = this.state;
              if (state == ST_CLOSING)
                  tryFinishClose();
              if (!completed && state >= ST_CLOSING)
                  throw new SocketException("Socket closed");

@@ -366,22 +366,22 @@
       * @throws SocketException if the socket is closed or not connected
       */
      private FileDescriptor beginWrite() throws SocketException {
          synchronized (stateLock) {
              ensureOpenAndConnected();
-             writerThread = NativeThread.current();
+             writerThread = NativeThread.threadToSignal();
              return fd;
          }
      }
  
      /**
       * Marks the end of a write operation that may have blocked.
       * @throws SocketException is the socket is closed
       */
      private void endWrite(boolean completed) throws SocketException {
          synchronized (stateLock) {
-             writerThread = 0;
+             writerThread = null;
              int state = this.state;
              if (state == ST_CLOSING)
                  tryFinishClose();
              if (!completed && state >= ST_CLOSING)
                  throw new SocketException("Socket closed");

@@ -508,22 +508,22 @@
  
              // save the remote address/port
              this.address = address;
              this.port = port;
  
-             readerThread = NativeThread.current();
+             readerThread = NativeThread.threadToSignal();
              return fd;
          }
      }
  
      /**
       * Marks the end of a connect operation that may have blocked.
       * @throws SocketException is the socket is closed
       */
      private void endConnect(FileDescriptor fd, boolean completed) throws IOException {
          synchronized (stateLock) {
-             readerThread = 0;
+             readerThread = null;
              int state = this.state;
              if (state == ST_CLOSING)
                  tryFinishClose();
              if (completed && state == ST_CONNECTING) {
                  this.state = ST_CONNECTED;

@@ -664,11 +664,11 @@
      private FileDescriptor beginAccept() throws SocketException {
          synchronized (stateLock) {
              ensureOpen();
              if (localport == 0)
                  throw new SocketException("Not bound");
-             readerThread = NativeThread.current();
+             readerThread = NativeThread.threadToSignal();
              return fd;
          }
      }
  
      /**

@@ -676,11 +676,11 @@
       * @throws SocketException is the socket is closed
       */
      private void endAccept(boolean completed) throws SocketException {
          synchronized (stateLock) {
              int state = this.state;
-             readerThread = 0;
+             readerThread = null;
              if (state == ST_CLOSING)
                  tryFinishClose();
              if (!completed && state >= ST_CLOSING)
                  throw new SocketException("Socket closed");
          }

@@ -842,11 +842,11 @@
      /**
       * Closes the socket if there are no I/O operations in progress.
       */
      private boolean tryClose() throws IOException {
          assert Thread.holdsLock(stateLock) && state == ST_CLOSING;
-         if (readerThread == 0 && writerThread == 0) {
+         if (readerThread == null && writerThread == null) {
              try {
                  cleaner.clean();
              } catch (UncheckedIOException ioe) {
                  throw ioe.getCause();
              } finally {

@@ -1141,12 +1141,12 @@
      protected void shutdownInput() throws IOException {
          synchronized (stateLock) {
              ensureOpenAndConnected();
              if (!isInputClosed) {
                  Net.shutdown(fd, Net.SHUT_RD);
-                 if (NativeThread.isVirtualThread(readerThread)) {
-                     Poller.stopPoll(fdVal(fd), Net.POLLIN);
+                 if (readerThread != null && readerThread.isVirtual()) {
+                     Poller.stopPoll(readerThread);
                  }
                  isInputClosed = true;
              }
          }
      }

@@ -1155,12 +1155,12 @@
      protected void shutdownOutput() throws IOException {
          synchronized (stateLock) {
              ensureOpenAndConnected();
              if (!isOutputClosed) {
                  Net.shutdown(fd, Net.SHUT_WR);
-                 if (NativeThread.isVirtualThread(writerThread)) {
-                     Poller.stopPoll(fdVal(fd), Net.POLLOUT);
+                 if (writerThread != null && writerThread.isVirtual()) {
+                     Poller.stopPoll(writerThread);
                  }
                  isOutputClosed = true;
              }
          }
      }